From: Kay Sievers Date: Wed, 21 Dec 2011 13:48:07 +0000 (-0200) Subject: do not (mis-)use the config file generator for non-autobuild stuff X-Git-Tag: v3~110 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fkmod.git;a=commitdiff_plain;h=9faa7b376c1e1a48d8763829bab0ac4f0b924b01 do not (mis-)use the config file generator for non-autobuild stuff "Similarly, you should not rely on AC_CONFIG_FILES to replace bindir and friends in your shell scripts and other files; instead, let make manage their replacement." http://www.gnu.org/software/autoconf/manual/autoconf.html#Makefile-Substitutions --- diff --git a/Makefile.am b/Makefile.am index 1186cff..9d2ac56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,19 @@ AM_LDFLAGS = \ -Wl,--gc-sections \ -Wl,--as-needed +SED_PROCESS = \ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@prefix\@,$(prefix),g' \ + -e 's,@exec_prefix\@,$(exec_prefix),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@includedir\@,$(includedir),g' \ + -e 's,@required_private_libs\@,$(required_private_libs),g' \ + < $< > $@ || rm $@ + +%.pc: %.pc.in Makefile + $(SED_PROCESS) + LIBKMOD_CURRENT=2 LIBKMOD_REVISION=0 LIBKMOD_AGE=1 @@ -52,6 +65,8 @@ libkmod_libkmod_la_LIBADD = @zlib_libs@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libkmod/libkmod.pc +EXTRA_DIST += libkmod/libkmod.pc.in +CLEANFILES += libkmod/libkmod.pc if BUILD_TOOLS bin_PROGRAMS = tools/kmod-insmod tools/kmod-rmmod tools/kmod-lsmod \ diff --git a/configure.ac b/configure.ac index 6569a6b..9c84a04 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,9 @@ AM_PROG_CC_C_O AC_PROG_GCC_TRADITIONAL AC_C_BIGENDIAN +AC_PROG_SED +AC_PROG_MKDIR_P + required_private_libs="" AC_ARG_WITH([rootprefix], @@ -122,7 +125,6 @@ AC_SUBST(required_private_libs) AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([ Makefile - libkmod/libkmod.pc ]) AC_OUTPUT