Blob Blame History Raw
diff --git a/Makefile b/Makefile
index 874bb46..e7c6fe1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@
 
 # Directory where qiv will be installed under.
 PREFIX = /usr/local
+DESTDIR =
+INSTALL = install
 
 # Fonts to use for statusbar and comments
 STATUSBAR_FONT = "Monospace 9"
@@ -63,8 +65,8 @@ CFLAGS    = -O2 -Wall \
 #	    -fcaller-saves -ffast-math -fno-strength-reduce \
 #	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
 
-INCLUDES  := $(shell $(PKG_CONFIG) --cflags gdk-2.0 imlib2)
-LIBS      := $(shell $(PKG_CONFIG) --libs gdk-2.0 imlib2) -lX11 -lXext -lgio-2.0
+INCLUDES  := $(shell $(PKG_CONFIG) --cflags gdk-2.0 imlib2 libxml-2.0)
+LIBS      := $(shell $(PKG_CONFIG) --libs gdk-2.0 imlib2 libxml-2.0) -lX11 -lXext -lgio-2.0
 
 # [as] thinks that this is not portable enough:
 # [lc] I use a virtual screen of 1600x1200, and the resolution is 1024x768,
@@ -144,27 +146,27 @@ distclean : clean
 
 install: $(PROGRAM)
 	@echo "Installing QIV..."
-	@if [ ! -e $(PREFIX)/bin ]; then \
-	  install -d -m 0755 $(PREFIX)/bin; \
-	  echo install -d -m 0755 $(PREFIX)/bin; \
+	@if [ ! -e $(DESTDIR)$(PREFIX)/bin ]; then \
+	  $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin; \
+	  echo $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin; \
         fi
-	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
-	@if [ ! -e $(PREFIX)/man/man1 ]; then \
-	  echo install -d -m 0755 $(PREFIX)/man/man1; \
-	  install -d -m 0755 $(PREFIX)/man/man1; \
+	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
+	@if [ ! -e $(DESTDIR)$(PREFIX)/share/man/man1 ]; then \
+	  echo $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1; \
+	  $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1; \
 	fi
-	install -m 0644 $(PROGRAM).1 $(PREFIX)/share/man/man1
-	$(COMPRESS_PROG) $(PREFIX)/share/man/man1/$(PROGRAM).1
-	@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
-	  echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
-	  install -d -m 0755 $(PREFIX)/share/pixmaps; \
+	$(INSTALL) -m 0644 $(PROGRAM).1 $(DESTDIR)$(PREFIX)/share/man/man1
+	$(COMPRESS_PROG) $(DESTDIR)$(PREFIX)/share/man/man1/$(PROGRAM).1
+	@if [ ! -e $(DESTDIR)$(PREFIX)/share/pixmaps ]; then \
+	  echo $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/pixmaps; \
+	  $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/pixmaps; \
 	fi
-	install -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
-	@if [ ! -e $(PREFIX)/share/applications ]; then \
-	  echo install -d -m 0755 $(PREFIX)/share/applications; \
-	  install -d -m 0755 $(PREFIX)/share/applications; \
+	$(INSTALL) -m 0644 qiv.png $(DESTDIR)$(PREFIX)/share/pixmaps/qiv.png
+	@if [ ! -e $(DESTDIR)$(PREFIX)/share/applications ]; then \
+	  echo $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications; \
+	  $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications; \
 	fi
-	install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
+	$(INSTALL) -m 0644 qiv.desktop $(DESTDIR)$(PREFIX)/share/applications/qiv.desktop
 	@if ./qiv -f ./intro.jpg ; \
 	then echo "-- Test Passed --" ; \
 	else echo "-- Test Failed --" ; \