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

Make: Fix configure generated for dist-client

Browse source 
Commit 1ec9b94 broke regeneration of configure for dist-client: it
uses .tarball-version, which exists only in the tarball, not in the
source tree.

Generating the client's autoconf stuff into the source tree is a
questionable idea anyway, as it won't run there.  Generate it while
building the tarball instead.

Bonus: doesn't distribute a useless .dirty-stamp.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-08-13 14:11:06 +02:00
parent 63c6dd6896
commit 10ddaca6b1
3 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -55,10 +55,6 @@
/configure /configure
/stamp-h.in /stamp-h.in
/sources.mk /sources.mk
# $(cli_distgen)
/src/client/aclocal.m4
/src/client/config.h.in
/src/client/configure
# Generic junk # Generic junk
*.orig *.orig

28
Make.mk
View file

@ -114,8 +114,6 @@ ac += $(basename $(filter %.in, $(src)))
ac += $(srcdir)/autom4te.cache $(srcdir)/src/client/autom4te.cache ac += $(srcdir)/autom4te.cache $(srcdir)/src/client/autom4te.cache
# distributed by dist-source from $(srcdir): # distributed by dist-source from $(srcdir):
acdist := aclocal.m4 config.h.in configure stamp-h.in acdist := aclocal.m4 config.h.in configure stamp-h.in
# distributed by dist-client from $(srcdir):
acdistcli := $(addprefix src/client/, aclocal.m4 config.h.in configure)
# Object files: # Object files:
obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o)) obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o))
# Dependencies: # Dependencies:
@ -166,9 +164,6 @@ distclean += $(addprefix $(srcdir)/, $(mk))
endif endif
# Distributed by dist-source from $(srcdir): # Distributed by dist-source from $(srcdir):
src_distgen := $(acdist) $(mk) src_distgen := $(acdist) $(mk)
# Distributed by dist-client from $(srcdir)/src/client; removed by distclean:
cli_distgen := $(acdistcli)
distclean += $(addprefix $(srcdir)/, $(cli_distgen))
# Compiler flags # Compiler flags
CPPFLAGS += -I$(srcdir)/include -I. CPPFLAGS += -I$(srcdir)/include -I.
@ -395,18 +390,20 @@ $(srcdir)/sources.mk:
endif endif
.PHONY: dist-client .PHONY: dist-client
dist-client: $(addprefix $(srcdir)/, $(cli_distgen)) dist-client:
$(tarball) -x $(srcdir)/src/scripts/gen-tarball-version \ $(tarball) -x $(srcdir)/src/scripts/gen-client-configure \
$(TARNAME)-client $(version) \ $(TARNAME)-client $(version) \
-C $(srcdir)/src/client \ -C $(srcdir)/src/client \
$(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \ $(notdir $(filter src/client/%, $(src))) \
-C $(srcdir)/include fnameat.h proto.h version.h \ -C $(srcdir)/include fnameat.h proto.h version.h \
-C $(srcdir)/src/lib/global version.c \ -C $(srcdir)/src/lib/global version.c \
-C $(srcdir)/src/lib/gen fnameat.c \ -C $(srcdir)/src/lib/gen fnameat.c \
-C $(srcdir)/src/lib $(addprefix w32/, $(client/w32)) \ -C $(srcdir)/src/lib $(addprefix w32/, $(client/w32)) \
-C $(srcdir)/man empire.6 \ -C $(srcdir)/man empire.6 \
-C $(srcdir)/build-aux install-sh \ -C $(srcdir)/build-aux install-sh \
-C $(srcdir) COPYING INSTALL -C $(srcdir) COPYING INSTALL \
m4/ax_lib_socket_nsl.m4 m4/my_lib_readline.m4 \
m4/my_terminfo.m4 m4/my_windows_api.m4
.PHONY: dist-info .PHONY: dist-info
dist-info: info html dist-info: info html
@ -449,16 +446,3 @@ config.status: configure
src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk src/lib/global/path.c src/client/ipglob.c: %: %.in GNUmakefile Make.mk
$(call quiet-command,$(subst.in) <$< >$@,GEN $@) $(call quiet-command,$(subst.in) <$< >$@,GEN $@)
# Make files for standalone client distribution
$(srcdir)/src/client/configure: src/client/configure.ac src/client/aclocal.m4
cd $(dir $@) && autoconf
$(srcdir)/src/client/config.h.in: src/client/configure.ac src/client/aclocal.m4
cd $(dir $@) && autoheader
touch $@
$(srcdir)/src/client/aclocal.m4: m4/ax_lib_socket_nsl.m4 m4/my_lib_readline.m4 m4/my_terminfo.m4 m4/my_windows_api.m4
cat $^ >$@

13
src/scripts/gen-client-configure Executable file
View file

@ -0,0 +1,13 @@
#!/bin/sh -e
if [ $# = 0 ]; then
echo "Usage: $0 NAME VERSION (FILE | -C DIR)..."
exit 1
fi
cd $1-$2
printf "%s" $2 >.tarball-version
cat m4/*.m4 >aclocal.m4
autoconf
autoheader
rm -rf m4 autom4te.cache