Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

build: Fix failure of "./configure; make dist".

Browse Source 
* Makefile.in (srcdir, VPATH): New variables.
(VERSION): Refer to src/version.cc in $(srcdir).
(dist): Depend on doc/gperf.1.
(doc/gperf.1): New rule.
* doc/Makefile.in (DISTRIBUTED_BUILT_FILES): Remove wildcard patterns.
(DISTRIBUTED_BUILT_FILES_EXTRA_PATTERNS): New variable.
(distdir): Handle the files from DISTRIBUTED_BUILT_FILES_EXTRA_PATTERNS.
This commit is contained in:
Bruno Haible
2024-07-22 02:27:34 +02:00
parent 043d5ea719
commit 5d1c6f3e24
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,14 @@
2024-07-21 Bruno Haible <bruno@clisp.org>
build: Fix failure of "./configure; make dist".
* Makefile.in (srcdir, VPATH): New variables.
(VERSION): Refer to src/version.cc in $(srcdir).
(dist): Depend on doc/gperf.1.
(doc/gperf.1): New rule.
* doc/Makefile.in (DISTRIBUTED_BUILT_FILES): Remove wildcard patterns.
(DISTRIBUTED_BUILT_FILES_EXTRA_PATTERNS): New variable.
(distdir): Handle the files from DISTRIBUTED_BUILT_FILES_EXTRA_PATTERNS.
2024-07-21 Bruno Haible <bruno@clisp.org> 2024-07-21 Bruno Haible <bruno@clisp.org>
build: Don't leave an empty gperf.1 on disk if help2man fails. build: Don't leave an empty gperf.1 on disk if help2man fails.

16
Makefile.in
View File

@@ -1,6 +1,6 @@
# Makefile for gperf # Makefile for gperf
# Copyright (C) 1989, 1992-1993, 1998, 2012, 2016, 2018, 2020, 2022 Free Software Foundation, Inc. # Copyright (C) 1989, 1992-1993, 1998, 2012, 2016, 2018, 2020, 2022, 2024 Free Software Foundation, Inc.
# Written by Douglas C. Schmidt <schmidt@ics.uci.edu> # Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
# and Bruno Haible <bruno@clisp.org>. # and Bruno Haible <bruno@clisp.org>.
# #
@@ -21,6 +21,9 @@
#### Start of system configuration section. #### #### Start of system configuration section. ####
# Directories used by "make":
srcdir = @srcdir@
# Programs used by "make": # Programs used by "make":
RM = rm -f RM = rm -f
@SET_MAKE@ @SET_MAKE@
@@ -29,6 +32,8 @@ RM = rm -f
SHELL = /bin/sh SHELL = /bin/sh
VPATH = $(srcdir)
all : force all : force
cd @subdir@; $(MAKE) all cd @subdir@; $(MAKE) all
@@ -87,7 +92,7 @@ distdir : $(DISTFILES)
# Creating a distribution tarball. # Creating a distribution tarball.
PACKAGE = gperf PACKAGE = gperf
VERSION = `sed -n -e 's/.*version_string = "\(.*\)".*/\1/p' < src/version.cc` VERSION = `sed -n -e 's/.*version_string = "\(.*\)".*/\1/p' < $(srcdir)/src/version.cc`
TAR = tar TAR = tar
GZIP = gzip GZIP = gzip
@@ -101,5 +106,12 @@ dist : force
&& $(GZIP) -9 $$tmpdistdir.tar \ && $(GZIP) -9 $$tmpdistdir.tar \
&& rm -rf $$tmpdistdir && rm -rf $$tmpdistdir
# Ensure that the manual page is up-to-date when "make dist" runs.
dist : doc/gperf.1
doc/gperf.1: $(srcdir)/src/options.cc
(cd lib && $(MAKE)) \
&& (cd src && $(MAKE) gperf$(EXEEXT)) \
&& (cd doc && $(MAKE) gperf.1)
force : force :

8
doc/Makefile.in
View File

@@ -182,8 +182,11 @@ DISTRIBUTED_BUILT_FILES = \
gperf.ps \ gperf.ps \
gperf.pdf \ gperf.pdf \
gperf.html \ gperf.html \
gperf_toc.html gperf_[0-9].html gperf_[0-9][0-9].html \ gperf_toc.html \
gperf.1 gperf.1
# Other distributed files, generated together with $(DISTRIBUTED_BUILT_FILES).
DISTRIBUTED_BUILT_FILES_EXTRA_PATTERNS = \
$(srcdir)/gperf_[0-9].html $(srcdir)/gperf_[0-9][0-9].html
# List of distributed files. # List of distributed files.
DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_BUILT_FILES) DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_BUILT_FILES)
@@ -192,6 +195,9 @@ distdir : gperf.1-update $(DISTFILES)
if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \ if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \ cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \
done done
for file in $(DISTRIBUTED_BUILT_FILES_EXTRA_PATTERNS); do \
cp -p $$file '$(distdir)'/ || exit 1; \
done
force : force :