Commit 1453a44c authored by sikeda's avatar sikeda
Browse files

[-bug] Use "$(INSTALL)" instead of "install" and "$(MKDIR_P)" instead of "$(mkdir_p)".


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12154 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 4ab534af
...@@ -81,7 +81,7 @@ installdir: ...@@ -81,7 +81,7 @@ installdir:
@for dir in $(modulesdir)/Sympa/Template/Plugin; do \ @for dir in $(modulesdir)/Sympa/Template/Plugin; do \
if [ ! -d $(DESTDIR)$$dir ] ; then \ if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \ echo "Creating $(DESTDIR)$$dir"; \
install -d -m 755 $(DESTDIR)$$dir; \ $(INSTALL) -d -m 755 $(DESTDIR)$$dir; \
fi; \ fi; \
done done
@echo "Creating writable directories" @echo "Creating writable directories"
...@@ -92,7 +92,7 @@ installdir: ...@@ -92,7 +92,7 @@ installdir:
$(bouncedir) $(arcdir) $(piddir) $(staticdir) $(staticdir)/js $(sysconfdir); do \ $(bouncedir) $(arcdir) $(piddir) $(staticdir) $(staticdir)/js $(sysconfdir); do \
if [ ! -d $(DESTDIR)$$dir ] ; then \ if [ ! -d $(DESTDIR)$$dir ] ; then \
echo "Creating $(DESTDIR)$$dir"; \ echo "Creating $(DESTDIR)$$dir"; \
install -d -m 755 $(DESTDIR)$$dir; \ $(INSTALL) -d -m 755 $(DESTDIR)$$dir; \
fi; \ fi; \
chown $(USER) $(DESTDIR)$$dir || /bin/true; \ chown $(USER) $(DESTDIR)$$dir || /bin/true; \
chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \ chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
...@@ -134,7 +134,7 @@ installconfig: installdir sympa_wizard.pl.inst ...@@ -134,7 +134,7 @@ installconfig: installdir sympa_wizard.pl.inst
mail_tt2 scenari search_filters web_tt2; do \ mail_tt2 scenari search_filters web_tt2; do \
if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \ if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \ echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
install -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \ $(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
fi; \ fi; \
chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \ chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \ chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
......
...@@ -68,7 +68,7 @@ man5pod: $(MAN5POD) Makefile ...@@ -68,7 +68,7 @@ man5pod: $(MAN5POD) Makefile
echo "$$pod" | $(SED) -e 's/\.pod$$//' \ echo "$$pod" | $(SED) -e 's/\.pod$$//' \
| while read tmp; do \ | while read tmp; do \
rm -f $$tmp.$(man5ext); \ rm -f $$tmp.$(man5ext); \
echo "GEN $$tmp.$(man5ext)"; \ echo " GEN " $$tmp.$(man5ext); \
$(POD2MAN) --section=$(man5ext) --center="sympa $(VERSION)" \ $(POD2MAN) --section=$(man5ext) --center="sympa $(VERSION)" \
--lax --release="$(VERSION)" $$pod $$tmp.$(man5ext); \ --lax --release="$(VERSION)" $$pod $$tmp.$(man5ext); \
done; \ done; \
...@@ -77,7 +77,7 @@ man5pod: $(MAN5POD) Makefile ...@@ -77,7 +77,7 @@ man5pod: $(MAN5POD) Makefile
install-data-hook: man5pod install-data-hook: man5pod
@test -n "$(man5ext)" || exit 0; \ @test -n "$(man5ext)" || exit 0; \
test -n "$(man5dir)" || exit 0; \ test -n "$(man5dir)" || exit 0; \
$(mkdir_p) "$(DESTDIR)$(man5dir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
for pod in $(MAN5POD); do \ for pod in $(MAN5POD); do \
echo "$$pod" | $(SED) -e 's/\.pod$$//' \ echo "$$pod" | $(SED) -e 's/\.pod$$//' \
| while read tmp; do \ | while read tmp; do \
......
...@@ -164,7 +164,7 @@ man3pm: $(MAN3POD) Makefile ...@@ -164,7 +164,7 @@ man3pm: $(MAN3POD) Makefile
install-data-hook: man3pm install-data-hook: man3pm
@test -n "$(man3ext)" || exit 0; \ @test -n "$(man3ext)" || exit 0; \
test -n "$(man3dir)" || exit 0; \ test -n "$(man3dir)" || exit 0; \
$(mkdir_p) "$(DESTDIR)$(man3dir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
for pm in $(MAN3POD); do \ for pm in $(MAN3POD); do \
echo "$$pm" \ echo "$$pm" \
| $(SED) -e 's/\.pm$$//' -e 's/\.pod$$//' -e 's/\//::/g' \ | $(SED) -e 's/\.pm$$//' -e 's/\.pod$$//' -e 's/\//::/g' \
......
...@@ -68,7 +68,7 @@ install-exec-hook: ...@@ -68,7 +68,7 @@ install-exec-hook:
chmod 4755 $(DESTDIR)$(libexecdir)/familyqueue chmod 4755 $(DESTDIR)$(libexecdir)/familyqueue
if SMRSH if SMRSH
@echo 'Installing symbolic links for Sendmail smrsh' @echo 'Installing symbolic links for Sendmail smrsh'
install -d -m 755 $(DESTDIR)$(smrshdir) $(INSTALL) -d -m 755 $(DESTDIR)$(smrshdir)
-rm -f $(DESTDIR)$(smrshdir)/queue -rm -f $(DESTDIR)$(smrshdir)/queue
$(LN_S) $(libexecdir)/queue $(DESTDIR)$(smrshdir)/queue $(LN_S) $(libexecdir)/queue $(DESTDIR)$(smrshdir)/queue
-rm -f $(DESTDIR)$(smrshdir)/bouncequeue -rm -f $(DESTDIR)$(smrshdir)/bouncequeue
...@@ -81,7 +81,7 @@ endif ...@@ -81,7 +81,7 @@ endif
chmod 4750 $(DESTDIR)$(libexecdir)/sympa_newaliases-wrapper chmod 4750 $(DESTDIR)$(libexecdir)/sympa_newaliases-wrapper
alias_manager.pl ldap_alias_manager.pl mysql_alias_manager.pl: Makefile alias_manager.pl ldap_alias_manager.pl mysql_alias_manager.pl: Makefile
rm -f $@ @rm -f $@
$(AM_V_GEN)$(SED) \ $(AM_V_GEN)$(SED) \
-e 's|--PERL--|$(PERL)|' \ -e 's|--PERL--|$(PERL)|' \
-e 's|--defaultdir--|$(defaultdir)|' \ -e 's|--defaultdir--|$(defaultdir)|' \
...@@ -95,14 +95,14 @@ alias_manager.pl ldap_alias_manager.pl mysql_alias_manager.pl: Makefile ...@@ -95,14 +95,14 @@ alias_manager.pl ldap_alias_manager.pl mysql_alias_manager.pl: Makefile
-e 's|--CONFIG--|$(CONFIG)|' \ -e 's|--CONFIG--|$(CONFIG)|' \
-e 's|--SENDMAIL_ALIASES--|$(SENDMAIL_ALIASES)|' \ -e 's|--SENDMAIL_ALIASES--|$(SENDMAIL_ALIASES)|' \
< $(srcdir)/$@.in > $@ < $(srcdir)/$@.in > $@
chmod +x $@ @chmod +x $@
alias_manager.pl: $(srcdir)/alias_manager.pl.in alias_manager.pl: $(srcdir)/alias_manager.pl.in
ldap_alias_manager.pl: $(srcdir)/ldap_alias_manager.pl.in ldap_alias_manager.pl: $(srcdir)/ldap_alias_manager.pl.in
mysql_alias_manager.pl: $(srcdir)/mysql_alias_manager.pl.in mysql_alias_manager.pl: $(srcdir)/mysql_alias_manager.pl.in
.pl.8: Makefile .pl.8: Makefile
rm -f $@ @rm -f $@
$(AM_V_GEN)$(POD2MAN) --section=8 --center="sympa $(VERSION)" \ $(AM_V_GEN)$(POD2MAN) --section=8 --center="sympa $(VERSION)" \
--lax --release="$(VERSION)" $*.pl $@ --lax --release="$(VERSION)" $*.pl $@
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment