empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix generation of src/client/aclocal.m4

Browse source 
Revert commit c3d2786f, because the resulting aclocal.m4 includes
stuff from outside the standalone build.  Generate with cat instead.
This commit is contained in:
Markus Armbruster 2009-04-25 08:52:47 +02:00
parent ad0f967fd6
commit cf4cb6c907
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Make.mk
View file

@ -54,7 +54,6 @@ endif
dirs := $(sort $(dir $(src)))
csrc := $(filter %.c, $(src))
tsrc := $(filter %.t, $(src))
m4src := $(filter m4/%.m4, $(src))
man6 := $(filter man/%.6, $(src))
builtins := $(filter src/lib/global/%.config, $(src))
@ -368,7 +367,7 @@ $(srcdir)/stamp-h.in: configure.ac aclocal.m4
cd $(srcdir) && autoheader
touch $@
$(srcdir)/aclocal.m4: $(m4src)
$(srcdir)/aclocal.m4: $(filter m4/%.m4, $(src))
cd $(srcdir) && aclocal -I m4
# config.status might not change config.h; use the stamp file.
@ -395,5 +394,5 @@ $(srcdir)/src/client/config.h.in: src/client/configure.ac src/client/aclocal.m4
cd $(dir $@) && autoheader
touch $@
$(srcdir)/src/client/aclocal.m4: $(m4src)
cd $(srcdir)/src/client && aclocal -I ../../m4
$(srcdir)/src/client/aclocal.m4: m4/lib_socket_nsl.m4 m4/my_termlib.m4 m4/my_windows_api.m4
cat $^ >$@