DESTDIR support is broken (patch)
Julien ÉLIE
julien at trigofacile.com
Thu May 22 18:14:26 UTC 2008
Hi Ivan,
Thanks for your patch. DESTDIR was indeed broken.
> --- 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
I think $D is missing in the first occurrence of the last two lines.
As for Makefile, shouldn't it be updated too?
I suggest that:
--- Makefile (révision 7829)
+++ Makefile (copie de travail)
@@ -109,7 +109,7 @@
echo '' ; \
cd $$D && $(MAKE) install || exit 1 ; cd .. ; \
done
- $(PATHBIN)/innupgrade $(PATHETC)
+ $(D)$(PATHBIN)/innupgrade $(D)$(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
But perhaps it should be:
test -z "$D" && $(PATHBIN)/innupgrade $(PATHETC)
for innupgrade, like what you suggest for makedbz, shouldn't it?
--
Julien ÉLIE
« As-tu jamais fait un rêve, Neo, dont tu avais l'impression
qu'il était réel ? Qu'est-ce qui se passerait si tu ne te réveillais jamais
de ce rêve, Neo ? Comment reconnaîtrais-tu le monde réel
du monde imaginaire ? » (Morpheus, _Matrix_)
More information about the inn-workers
mailing list