DESTDIR support is broken (patch)

Ivan Shmakov oneingray at gmail.com
Thu May 22 09:47:33 UTC 2008


diff --git a/doc/man/Makefile b/doc/man/Makefile
index 30a8fa0..8861e56 100644
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -52,9 +52,9 @@ install-man5:
 	for M in $(SEC5) ; do \
 	    $(CP_MAN) $$M $D$(MAN5)/$$M ; \
 	done
-	rm -f $(MAN5)/localgroups.5 $(MAN5)/nocem.ctl.5
-	$(LN_S) $(MAN8)/docheckgroups.8 $(MAN5)/localgroups.5
-	$(LN_S) $(MAN8)/perl-nocem.8 $(MAN5)/nocem.ctl.5
+	rm -f $D$(MAN5)/localgroups.5 $D$(MAN5)/nocem.ctl.5
+	$(LN_S) $(MAN8)/docheckgroups.8 $D$(MAN5)/localgroups.5
+	$(LN_S) $(MAN8)/perl-nocem.8 $D$(MAN5)/nocem.ctl.5
 
 # auth_krb5 is conditionally compiled, so handle it specially.  actsync(8)
 # also covers actsyncd.
@@ -62,8 +62,8 @@ install-man8:
 	for M in $(SEC8) ; do \
 	    $(CP_MAN) $$M $D$(MAN8)/$$M ; \
 	done
-	rm -f $(MAN8)/actsyncd.8
-	cd $(MAN8) && $(LN_S) actsync.8 actsyncd.8
+	rm -f $D$(MAN8)/actsyncd.8
+	cd $D$(MAN8) && $(LN_S) actsync.8 actsyncd.8
 	if [ x"$(KRB5_AUTH)" != x ] ; then \
 	    $(CP_MAN) auth_krb5.8 $D$(MAN8)/auth_krb5.8 ; \
 	fi
diff --git a/site/Makefile b/site/Makefile
index 3a45568..5cd2035 100644
--- a/site/Makefile
+++ b/site/Makefile
@@ -140,7 +140,8 @@ $D$(PATH_HISTORY):
 	chown $(RUNASUSER) $@
 	chgrp $(RUNASGROUP) $@
 	chmod $(FILEMODE) $@
-	$(PATHBIN)/makedbz -i -o
+	# INNCONF=$D$(PATH_CONFIG) $D$(PATHBIN)/makedbz -i -o
+	test -z "$D" && $(PATHBIN)/makedbz -i -o
 
 bootstrap:
 



More information about the inn-workers mailing list