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

MSYS ships an obsolete version of GNU make which doesn't grok

Browse source 
order-only prerequisites.  They were used to make directories
info.html, info.nr, lib.  Make them ahead of time, in configure.  Also
fixes distclean not removing them.
This commit is contained in:
Markus Armbruster 2006-03-04 21:18:15 +00:00
parent 0605e10c50
commit 13421c7c0e
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Make.mk
View file

@ -86,7 +86,7 @@ subst.in = sed \
# See `Cleanliness' below
# sources.mk subjects.mk
# Generated by Autoconf, not distributed:
ac := config.h config.log config.status stamp-h
ac := config.h config.log config.status info.html info.nr lib stamp-h
ac += $(basename $(filter %.in, $(src)))
ac += $(srcdir)/autom4te.cache $(srcdir)/src/client/autom4te.cache
# distributed by dist-source from $(srcdir):
@ -174,7 +174,7 @@ install: all installdirs
$(INSTALL_DATA) $(info.nr) $(einfodir)
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(man1)) $(mandir)/man1
$(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
if test -e $(econfig); then \
if [ -e $(econfig) ]; then \
if src/util/pconfig $(econfig) >$(econfig).new; then \
if cmp -s $(econfig) $(econfig).new; then \
rm $(econfig).new; \
@ -193,7 +193,8 @@ installdirs:
mkdir -p $(sbindir) $(bindir) $(builtindir) $(einfodir) $(mandir)/man1 $(mandir)/man6 $(dir $(econfig)) $(gamedir)
.PHONY: install-html
install-html: html | $(ehtmldir)
install-html: html
mkdir -p $(ehtmldir)
$(INSTALL_DATA) $(info.html) $(ehtmldir)
.PHONY: uninstall
@ -257,7 +258,7 @@ lib/libgen.a: $(filter src/lib/gen/%, $(obj))
lib/libglobal.a: $(filter src/lib/global/%, $(obj))
lib/liblwp.a: $(filter src/lib/lwp/%, $(obj))
$(libs) $(empth_lib): | lib
$(libs) $(empth_lib):
$(AR) rc $@ $?
$(RANLIB) $@
@ -284,13 +285,10 @@ info.html/all.html: $(filter-out info.html/all.html, $(info.html)) info/ls2html.
(cd info.html && ls -C $(notdir $(info.html))) | expand | perl $(filter %.pl, $^) >$@
# FIXME shouldn't use ls
$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk | info.nr
$(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
$(subjects.html) info.html/TOP.html: info/subj2html.pl | info.html
$(topics.html): info/emp2html.pl | info.html
info.nr info.html lib:
mkdir -p $@
$(subjects.html) info.html/TOP.html: info/subj2html.pl
$(topics.html): info/emp2html.pl
ifeq ($(cvs_controlled),yes)
# Find files and directories under CVS control