files/destdir.patch

destdir.patch (text/plain), 1.40 KB, created by Christoph Bussenius on 2005-05-22 16:56:47 UTC

hypermail does not seem to get the DESTDIR handling right.
Plus, for that matter, we fix the MAKEFLAGS passing, even though portage does
not use it.
--- Makefile.in	2005-05-21 21:13:55.288915280 +0200
+++ notbroken-Makefile.in	2005-05-21 21:22:44.945395256 +0200
@@ -44,16 +44,21 @@
 
 install: 
 	@cd src; $(MAKE) install CC="$(CC)" CFLAGS="$(CFLAGS)" \
-		cgidir="$(cgidir)" bindir="$(bindir)" LIBS="$(LIBS)"
+		cgidir="$(DESTDIR)$(cgidir)" bindir="$(DESTDIR)$(bindir)" \
+	        LIBS="$(LIBS)" DESTDIR="$(DESTDIR)"
 	@cd docs; $(MAKE) install CC="$(CC)" CFLAGS="$(CFLAGS)" \
-		$(MAKEFLAGS) mandir="$(mandir)" htmldir="$(htmldir)"
+		mandir="$(DESTDIR)$(mandir)" \
+		htmldir="$(DESTDIR)$(htmldir)" DESTDIR="$(DESTDIR)"
 	@cd archive; $(MAKE) install CC="$(CC)" CFLAGS="$(CFLAGS)" \
-		bindir="$(bindir)"
+		bindir="$(DESTDIR)$(bindir)" DESTDIR="$(DESTDIR)"
 
 uninstall: 
-	@cd src; $(MAKE) uninstall cgidir="$(cgidir)" bindir="$(bindir)" 
-	@cd docs; $(MAKE) uninstall mandir="$(mandir)" htmldir="$(htmldir)"
-	@cd archive; $(MAKE) uninstall bindir="$(bindir)"
+	@cd src; $(MAKE) uninstall cgidir="$(DESTDIR)$(cgidir)" \
+	        bindir="$(DESTDIR)$(bindir)" DESTDIR="$(DESTDIR)"
+	@cd docs; $(MAKE) uninstall mandir="$(DESTDIR)$(mandir)" \
+	        htmldir="$(DESTDIR)$(htmldir)" DESTDIR="$(DESTDIR)"
+	@cd archive; $(MAKE) uninstall bindir="$(DESTDIR)$(bindir)" \
+		DESTDIR="$(DESTDIR)"
 
 lint:	
 	@cd src; $(MAKE) lint