From feb44d32931c1de1dc96c93ca80ba2a11c57bc76 Mon Sep 17 00:00:00 2001
From: kwaclaw <kwaclaw>
Date: Wed, 9 May 2007 18:38:50 +0000
Subject: One more patch for bug #1490371.

---
 Makefile.in | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 54c887c..0e2cc95 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,9 +44,7 @@ MANFILE = $(srcdir)/doc/xmlwf.1
 APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
 LIBRARY = libexpat.la
 
-ifeq ($(INSTALL_ROOT),)
-INSTALL_ROOT = $(DESTDIR)
-endif
+DESTDIR = $(INSTALL_ROOT)
 
 default:  buildlib xmlwf/xmlwf
 
@@ -78,23 +76,23 @@ check: tests/runtests tests/runtestspp
 	tests/runtestspp
 
 install: xmlwf/xmlwf installlib
-	$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf
-	$(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir)
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
+	$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
 
 installlib: $(LIBRARY) $(APIHEADER)
-	$(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY)
-	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done
+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
 
 uninstall: uninstalllib
-	$(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf
-	rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
+	rm -f $(DESTDIR)$(man1dir)/xmlwf.1
 
 uninstalllib:
-	$(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY)
-	rm -f $(INSTALL_ROOT)$(includedir)/expat.h
-	rm -f $(INSTALL_ROOT)$(includedir)/expat_external.h
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
+	rm -f $(DESTDIR)$(includedir)/expat.h
+	rm -f $(DESTDIR)$(includedir)/expat_external.h
 
 # for VPATH builds (invoked by configure)
 mkdir-init:
-- 
cgit v1.2.1