INN commit: trunk (Makefile doc/man/Makefile site/Makefile)
INN Commit
Russ_Allbery at isc.org
Fri May 23 16:22:55 UTC 2008
Date: Friday, May 23, 2008 @ 09:22:54
Author: iulius
Revision: 7841
Fix DESTDIR support thanks to Ivan Shmakov.
Modified:
trunk/Makefile
trunk/doc/man/Makefile
trunk/site/Makefile
------------------+
Makefile | 18 +++++++++---------
doc/man/Makefile | 10 +++++-----
site/Makefile | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
Modified: Makefile
===================================================================
--- Makefile 2008-05-22 18:44:18 UTC (rev 7840)
+++ Makefile 2008-05-23 16:22:54 UTC (rev 7841)
@@ -109,7 +109,7 @@
echo '' ; \
cd $$D && $(MAKE) install || exit 1 ; cd .. ; \
done
- $(PATHBIN)/innupgrade $(PATHETC)
+ test -z "$D" && $(PATHBIN)/innupgrade $(PATHETC)
install-root:
@chmod +x support/install-sh
@@ -119,14 +119,14 @@
## Install a certificate for TLS/SSL support.
cert:
$(SSLBIN) req -new -x509 -nodes \
- -out $(PATHLIB)/cert.pem -days 366 \
- -keyout $(PATHLIB)/key.pem
- chown $(RUNASUSER) $(PATHLIB)/cert.pem
- chgrp $(RUNASGROUP) $(PATHLIB)/cert.pem
- chmod 640 $(PATHLIB)/cert.pem
- chown $(RUNASUSER) $(PATHLIB)/key.pem
- chgrp $(RUNASGROUP) $(PATHLIB)/key.pem
- chmod 600 $(PATHLIB)/key.pem
+ -out $(D)$(PATHLIB)/cert.pem -days 366 \
+ -keyout $(D)$(PATHLIB)/key.pem
+ chown $(RUNASUSER) $(D)$(PATHLIB)/cert.pem
+ chgrp $(RUNASGROUP) $(D)$(PATHLIB)/cert.pem
+ chmod 640 $(D)$(PATHLIB)/cert.pem
+ chown $(RUNASUSER) $(D)$(PATHLIB)/key.pem
+ chgrp $(RUNASGROUP) $(D)$(PATHLIB)/key.pem
+ chmod 600 $(D)$(PATHLIB)/key.pem
## Cleanup targets. clean deletes all compilation results but leaves the
Modified: doc/man/Makefile
===================================================================
--- doc/man/Makefile 2008-05-22 18:44:18 UTC (rev 7840)
+++ doc/man/Makefile 2008-05-23 16:22:54 UTC (rev 7841)
@@ -52,9 +52,9 @@
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 @@
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
+ $(LN_S) $(MAN8)/actsync.8 $D$(MAN8)/actsyncd.8
if [ x"$(KRB5_AUTH)" != x ] ; then \
$(CP_MAN) auth_krb5.8 $D$(MAN8)/auth_krb5.8 ; \
fi
Modified: site/Makefile
===================================================================
--- site/Makefile 2008-05-22 18:44:18 UTC (rev 7840)
+++ site/Makefile 2008-05-23 16:22:54 UTC (rev 7841)
@@ -140,7 +140,7 @@
chown $(RUNASUSER) $@
chgrp $(RUNASGROUP) $@
chmod $(FILEMODE) $@
- $(PATHBIN)/makedbz -i -o
+ test -z "$D" && $(PATHBIN)/makedbz -i -o
bootstrap:
More information about the inn-committers
mailing list