Преглед изворни кода

Let automake handle the NSIS substitutions

Richard Laager пре 15 година
родитељ
комит
b2a4f0046e
4 измењених фајлова са 3 додато и 9 уклоњено
  1. 1 0
      .gitignore
  2. 1 8
      Makefile.am
  3. 0 0
      build_setup.nsi.in
  4. 1 1
      configure.in

+ 1 - 0
.gitignore

@@ -12,6 +12,7 @@ Makefile.in
 README
 aclocal.m4
 autom4te.cache
+build_setup.nsi
 config.cache
 config.h
 config.h.in

+ 1 - 8
Makefile.am

@@ -6,18 +6,11 @@ README: doc/index.html
 	(echo This file is generated from doc/index.html, which is easier to read if you have ; echo a web browser available. ; echo ; w3m doc/index.html) > README
 
 SUBDIRS = src doc examples mibs
-EXTRA_DIST = build_setup_template.nsi README
+EXTRA_DIST = build_setup.nsi.in README
 if CYGWIN_BUILD
 if CYGWIN_BUILD_SETUP_EXE
 bin_SCRIPTS=docsis_setup.exe
 docsis_setup.exe: build_setup.nsi
 	"${MAKENSIS}" build_setup.nsi
-
-build_setup.nsi: build_setup_template.nsi
-	echo "s/@@buildroot@@/${CYGWIN_BUILDROOT}/g" | sed 's/\\/\\\\/g' > config_build_sedscript
-	echo "s/@@netsnmproot@@/${NETSNMP_MIBPATH}/g" | sed 's/\\/\\\\/g' >> config_build_sedscript
-	sed -f config_build_sedscript < build_setup_template.nsi > build_setup.nsi
-
-CLEANFILES=config_build_sedscript build_setup.nsi
 endif
 endif

build_setup_template.nsi.in → build_setup.nsi.in


+ 1 - 1
configure.in

@@ -181,4 +181,4 @@ if test "x$GCC" = "xyes"; then
 	CFLAGS="-Wall $DEBUG_CFLAGS -g $CFLAGS"
 fi
 
-AC_OUTPUT(build_setup_template.nsi Makefile src/Makefile doc/Makefile examples/Makefile mibs/Makefile)
+AC_OUTPUT(build_setup.nsi Makefile src/Makefile doc/Makefile examples/Makefile mibs/Makefile)