diff options
author | devzero2000 <devzero2000> | 2011-04-15 10:52:43 +0000 |
---|---|---|
committer | devzero2000 <devzero2000> | 2011-04-15 10:52:43 +0000 |
commit | eae407b47b88e48da6b3be6c2aedbc703aa435af (patch) | |
tree | febcc91ff730cb2411f646f39f14824050876ccd | |
parent | 23c9b894d0a3b44558d56db367a4ddc770d68a72 (diff) | |
download | libpopt-eae407b47b88e48da6b3be6c2aedbc703aa435af.tar.gz |
fix the configmake.h make rule: update its timestamp also if it don't change
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | Makefile.am | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -1,4 +1,5 @@ 1.17 -> 2.0: + - devzero2000: fix the configmake.h make rule: update its timestamp also if it don't change. - devzero2000: revert bad commit: add missing glob.h and fnmatch.h in configure.ac, add struct sb in poptconfig.c - devzero2000: Rewrite the logic in poptReadDefaultConfig for finding the popt alias file diff --git a/Makefile.am b/Makefile.am index 76e8fcb..f2b2561 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ configmake.h: Makefile } | sed '/""/d' > $@-t && \ if test -f $@ && cmp $@-t $@ > /dev/null; then \ rm -f $@-t; \ + touch $@; \ else \ rm -f $@; mv $@-t $@; \ fi @@ -124,6 +125,9 @@ libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ $(AM_LDFLAGS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = popt.pc +poptaliasdir = $(sysconfdir)/popt.d +poptalias_DATA = + if HAVE_LD_VERSION_SCRIPT libpopt_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/libpopt.vers endif |