Commit 83545fbb authored by david.verdin's avatar david.verdin
Browse files

[svn] Retrieving latest commits from Guillaume Rousse in the autotools-cleanup branch.


git-svn-id: https://subversion.renater.fr/sympa/trunk@6188 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 05ef62fc
......@@ -22,6 +22,7 @@
AC_PREREQ(2.59)
AC_INIT(sympa, 6.0b.2, sympa-authors@cru.fr)
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_PO_SUBDIRS
AC_PREFIX_DEFAULT(/home/sympa)
......@@ -323,6 +324,8 @@ AC_SUBST(WWSCONFIG)
AC_PROG_CC
# needed for using per-target flags
AM_PROG_CC_C_O
AC_PROG_SED
AC_PROG_LN_S
AC_ARG_WITH(
[perl],
......@@ -356,6 +359,11 @@ else
fi
fi
AC_PATH_PROG(POD2MAN, pod2man)
if test -z "$POD2MAN"; then
AC_MSG_ERROR([pod2man required])
fi
USER=sympa
AC_ARG_WITH(
[user],
......
......@@ -6,11 +6,12 @@ CLEANFILES = $(man8_MANS) archived.pod bounced.pod alias_manager.pod
.pod.8:
rm -f $@
pod2man --section=8 --center="sympa $(VERSION)" --lax --release="$(VERSION)" $< $@
$(AM_V_GEN)$(POD2MAN) --section=8 --center="sympa $(VERSION)" \
--lax --release="$(VERSION)" $< $@
archived.pod bounced.pod alias_manager.pod: Makefile
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--piddir--|$(piddir)|' \
-e 's|--libexecdir--|$(libexecdir)|' \
-e 's|--sysconfdir--|$(sysconfdir)|' \
......
......@@ -67,4 +67,4 @@ EXTRA_DIST = $(mailtemplate_DATA)
install-data-hook:
(cd $(DESTDIR)$(webtemplatedir); \
rm -f authorization_reject.tt2; \
ln -s ../mail_tt2/authorization_reject.tt2)
$(LN_S) -f ../mail_tt2/authorization_reject.tt2)
......@@ -44,7 +44,7 @@ install-exec-hook:
sympa_soap_client.pl sympa_soap_server.fcgi: Makefile
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--PERL--|$(PERL)|' \
-e 's|--modulesdir--|$(modulesdir)|' \
< $(srcdir)/$@.in > $@
......
......@@ -71,7 +71,7 @@ install-exec-hook:
alias_manager.pl bulk.pl task_manager.pl sympa.pl sympa_wizard.pl: Makefile
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--PERL--|$(PERL)|' \
-e 's|--modulesdir--|$(modulesdir)|' \
< $(srcdir)/$@.in > $@
......
......@@ -170,12 +170,12 @@ DEFAULT_SCENARIOS = add.owner \
list_aliases.tt2: Makefile list_aliases.tt2.in
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--libexecdir--|$(libexecdir)|' \
< $(srcdir)/$@.in > $@
install-data-hook:
cd $(DESTDIR)$(defaultdir)/scenari; \
for file in $(DEFAULT_SCENARIOS); do \
ln -sf $$file `echo $$file | sed -e 's/\.[^.]\+$$/.default/'`; \
$(LN_S) -f $$file `echo $$file | $(SED) -e 's/\.[^.]\+$$/.default/'`; \
done
......@@ -39,7 +39,7 @@ CLEANFILES = $(perlscripts) $(init_SCRIPTS)
arc2webarc.pl crypt_passwd.pl init_comment.pl ldap_alias_manager.pl mod2html.pl mysql_alias_manager.pl p12topem.pl testldap.pl testlogs.pl tpl2tt2.pl: Makefile
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--PERL--|$(PERL)|' \
-e 's|--modulesdir--|$(modulesdir)|' \
< $(srcdir)/$@.in > $@
......@@ -47,7 +47,7 @@ arc2webarc.pl crypt_passwd.pl init_comment.pl ldap_alias_manager.pl mod2html.pl
sympa: Makefile
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--CONFIG--|$(CONFIG)|' \
-e 's|--WWSCONFIG--|$(WWSCONFIG)|' \
-e 's|--sbindir--|$(sbindir)|' \
......
......@@ -13,7 +13,7 @@ CLEANFILES = Sympa/Constants.pm
Sympa/Constants.pm: Sympa/Constants.pm.in Makefile
[ -d Sympa ] || mkdir Sympa
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--VERSION--|$(VERSION)|' \
-e 's|--USER--|$(USER)|' \
-e 's|--GROUP--|$(GROUP)|' \
......
......@@ -140,6 +140,6 @@ EXTRA_DIST = $(webtemplate_DATA)
install-data-hook:
cd $(DESTDIR)$(webtemplatedir); \
ln -sf review.tt2 search.tt2; \
ln -sf lists.tt2 which.tt2; \
ln -sf lists.tt2 search_list.tt2
$(LN_S) -f review.tt2 search.tt2; \
$(LN_S) -f lists.tt2 which.tt2; \
$(LN_S) -f lists.tt2 search_list.tt2
......@@ -46,7 +46,7 @@ install-exec-hook:
archived.pl bounced.pl wwsympa.fcgi: Makefile
rm -f $@
sed \
$(AM_V_GEN)$(SED) \
-e 's|--PERL--|$(PERL)|' \
-e 's|--modulesdir--|$(modulesdir)|' \
< $(srcdir)/$@.in > $@
......
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