summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2013-04-13 02:45:51 +0000
committerPeter Eisentraut2013-04-13 02:49:25 +0000
commitba66752d278818b6b8797aec2e36cccf727db055 (patch)
tree6c5c94c5de2c45a8530d5145be70fd23f7afb97a
parent0b337904213337db5026ef0a756a447588023935 (diff)
Fix sporadic rebuilds for .pc files
The build of .pc (pkg-config) files depends on all makefiles in use, and in dependency tracking mode, the previous coding ended up including /dev/null as a makefile. Apparently, on some platforms the modification time of /dev/null changes sporadically, and so the .pc files would end up being rebuilt every so often. Fix that by changing the makefile code to do without using /dev/null.
-rw-r--r--src/Makefile.global.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 1077e0b98ab..80f509fa872 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -687,9 +687,12 @@ ifeq ($(GCC), yes)
endif # GCC
# Include all the dependency files generated for the current
-# directory. List /dev/null as dummy because if the wildcard expands
-# to nothing then make would complain.
--include $(wildcard $(DEPDIR)/*.Po) /dev/null
+# directory. Note that make would complain if include was called with
+# no arguments.
+Po_files := $(wildcard $(DEPDIR)/*.Po)
+ifneq (,$(Po_files))
+include $(Po_files)
+endif
# hook for clean-up
clean distclean maintainer-clean: clean-deps