[Initng-svn] r3168 - in initng/trunk: . doc

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Mar  2 03:38:33 2006
New Revision: 3168

Modified:
   initng/trunk/Makefile.am
   initng/trunk/configure.ac
   initng/trunk/doc/Makefile.am
Log:
Buildsystem merge Bug #492


Modified: initng/trunk/Makefile.am
==============================================================================
--- initng/trunk/Makefile.am	(original)
+++ initng/trunk/Makefile.am	Thu Mar  2 03:38:33 2006
@@ -4,9 +4,6 @@
 
 sbin_SCRIPTS = gen_system_runlevel
 
-BUILT_SOURCES = initng-paths.h
-CLEANFILES =    initng-paths.h
-
 EXTRA_DIST = \
 	$(sbin_SCRIPTS) \
 	FAQ \
@@ -32,12 +29,3 @@
 	./count_me.sh
 endif
 
-initng-paths.h:		$(top_builddir)/config.status
-	@echo '#ifndef INITNG_INITNG_PATHS_H'  >$@
-	@echo '#define INITNG_INITNG_PATHS_H' >>$@
-	@echo '#define DEVDIR			"$(devdir)"'        >>$@
-	@echo '#define ETCDIR			"$(sysconfdir)"'    >>$@
-	@echo '#define VARDIR			"$(localstatedir)"' >>$@
-	@echo '#define INITNG_ROOT		"$(iconfdir)"'      >>$@
-	@echo '#define INITNG_PLUGIN_DIR	"$(pkglibdir)"'     >>$@
-	@echo '#endif /* INITNG_INITNG_PATHS_H */'                  >>$@

Modified: initng/trunk/configure.ac
==============================================================================
--- initng/trunk/configure.ac	(original)
+++ initng/trunk/configure.ac	Thu Mar  2 03:38:33 2006
@@ -56,15 +56,6 @@
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-plugindir=$libdir/initng
-AC_SUBST(plugindir)
-
-iconfdir=$sysconfdir/initng
-AC_SUBST(iconfdir)
-
-PLUGIN_LDFLAGS='-module -avoid-version'
-AC_SUBST(PLUGIN_LDFLAGS)
-
 dnl Checks for libraries.
 dnl Replace `main' with a function in -lc:
 AC_CHECK_LIB(c, main)
@@ -101,30 +92,31 @@
 AC_FUNC_WAIT3
 AC_CHECK_FUNCS(getcwd mkdir mkfifo select socket strcspn strdup strerror strspn strstr strtod strtol strtoul)
 
-AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-AS_AC_EXPAND(DATADIR, $datadir)
-AS_AC_EXPAND(BINDIR, $bindir)
-AS_AC_EXPAND(SBINDIR, $sbindir)
-AS_AC_EXPAND(LIBDIR, $libdir)
 
 AC_ARG_WITH(dev-dir, AS_HELP_STRING(--with-dev-dir,Directory for the initng control socket),
             [devdir="$with_dev_dir"],
             [devdir=/dev])
-AC_SUBST(devdir)
 
 
-AC_ARG_WITH(doc-dir, AS_HELP_STRING(--with-doc-dir,Directory to install documentation))
-if ! test -z "$with_doc_dir"; then
-   DOCDIR=$with_doc_dir
-else
-   DOCDIR="$DATADIR/doc/initng"
-fi
+AC_ARG_WITH(doc-dir, AS_HELP_STRING(--with-doc-dir,Directory to install documentation),
+            [docdir="$with_doc_dir"],
+            [docdir="$datadir/doc/initng"])
+
+AS_AC_EXPAND(sysconfdir, $sysconfdir)
+AS_AC_EXPAND(datadir, $datadir)
+AS_AC_EXPAND(localstatedir, $localstatedir)
+AS_AC_EXPAND(bindir, $bindir)
+AS_AC_EXPAND(sbindir, $sbindir)
+AS_AC_EXPAND(libdir, $libdir)
+AS_AC_EXPAND(docdir, $docdir)
+
+AC_SUBST(devdir)
+AC_SUBST(docdir)
+AC_SUBST(plugindir,$libdir/initng)
+AC_SUBST(iconfdir,$sysconfdir/initng)
 
-AC_SUBST(SYSCONFDIR)
-AC_SUBST(BINDIR)
-AC_SUBST(SBINDIR)
-AC_SUBST(LIBDIR)
-AC_SUBST(DOCDIR)
+PLUGIN_LDFLAGS='-module -avoid-version'
+AC_SUBST(PLUGIN_LDFLAGS)
 
 AC_ARG_ENABLE(install-init, 
     AS_HELP_STRING(--enable-install-init,Initng will install itself as new init system @<:@default=no@:>@),
@@ -381,6 +373,7 @@
 AM_CONDITIONAL(BUILD_JBX, test "$with_jbx" = "yes")
 
 AC_CONFIG_FILES([Makefile \
+	  initng-paths.h \
 	  src/Makefile \
 	  devtool/Makefile \
 	  plugins/Makefile \
@@ -449,7 +442,7 @@
 echo Install as init........................ : $install_init
 echo Selinux support........................ : $selinux_support
 echo Debug.................................. : $with_debug
-echo Docdir. ............................... : $DOCDIR
+echo Docdir................................. : $docdir
 echo Build also plugin...................... : $with_also
 echo Build bash_launcher plugin............. : $with_bash_launcher
 echo Build chdir plugin..................... : $with_chdir
@@ -494,5 +487,3 @@
 echo
 echo Build pidfile test program............. : $with_pidfile_test
 echo
-
-AC_SUBST(DOCDIR)

Modified: initng/trunk/doc/Makefile.am
==============================================================================
--- initng/trunk/doc/Makefile.am	(original)
+++ initng/trunk/doc/Makefile.am	Thu Mar  2 03:38:33 2006
@@ -6,7 +6,6 @@
 	ngdc.8 \
 	ng-update.8
 
-docdir = $(DOCDIR)
 doc_DATA = \
 	gentoo-chart.png \
 	imanual.txt \