Seems my last no_as_ac_expand.patch was not quite complete and broke powersaved as it didn't expand the variables at make time. The recommended way is described in the gnu autconf manual [1]. So, the patch does the following
1.) Generates manpages / initscript at make time, using sed. Remove them from AC_CONFIGURE_FILES. 2.) Pass the paths via defines in AM_CPPFLAGS instead of config.h (removed AC_DEFINE_UNQUOTED for all path variables) 3.) Removed custom $docdir variable completely, as autconf 2.59 already provides $docdir Cheers, Michael [1] http://www.gnu.org/software/autoconf/manual/html_node/Installation-Directory-Variables.html#Installation-Directory-Variables -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
Index: scripts/rcpowersaved.in
===================================================================
--- scripts/rcpowersaved.in (Revision 2905)
+++ scripts/rcpowersaved.in (Arbeitskopie)
@@ -53,7 +53,7 @@
### END INIT INFO
# Check for missing binaries (stale symlinks should not happen)
-powersaved_BIN=/usr/sbin/powersaved
[EMAIL PROTECTED]@/powersaved
[EMAIL PROTECTED]@/powersave
ACPID_BIN=/sbin/acpid
S2RAM_BIN=/usr/sbin/s2ram
Index: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am (Revision 2905)
+++ scripts/Makefile.am (Arbeitskopie)
@@ -1,3 +1,5 @@
+SCRIPT_IN_FILES = rcpowersaved.in setDefaultTrippoints.sh.in
+
pubscript_SCRIPTS = \
helper_functions \
x_helper_functions \
@@ -31,19 +33,19 @@
EXTRA_DIST = $(pubscript_SCRIPTS) \
$(script_SCRIPTS) \
$(doc_SCRIPTS) \
+ $(SCRIPT_IN_FILES) \
rcpowersaved \
rcpowersaved.redhat
+%: %.in Makefile
+ $(edit) $< >$@
+
edit = sed \
- -e 's,@bindir\@,$(bindir),g' \
- -e 's,@sbindir\@,$(sbindir),g'
+ -e 's|@[EMAIL PROTECTED]|,$(bindir)|g' \
+ -e 's|@[EMAIL PROTECTED]|$(sbindir)|g' \
+ -e 's|@[EMAIL PROTECTED]|$(configdir)|g'
-#rcfile: Makefile powersaved.init.in
-# rm -f powersaved.init powersaved.init.tmp
-# chmod +w powersaved.init.in
-# $(edit) powersaved.init.in >powersaved.init.tmp
-# chmod +x powersaved.init.tmp
-# mv powersaved.init.tmp powersaved.init
+CLEANFILES = rcpowersaved setDefaultTrippoints.sh
install-exec-hook:
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d
Index: docs/Makefile.am
===================================================================
--- docs/Makefile.am (Revision 2905)
+++ docs/Makefile.am (Arbeitskopie)
@@ -1,8 +1,17 @@
SUBDIRS = autodocs
-man_MANS = powersave.8 \
- powersaved.8
+MAN_IN_FILES = powersave.8.in powersaved.8.in
+man_MANS = $(MAN_IN_FILES:.in=)
+%: %.in Makefile
+ $(edit) $< >$@
+
+edit = sed \
+ -e 's|@[EMAIL PROTECTED]|$(pubscriptdir)|g' \
+ -e 's|@[EMAIL PROTECTED]|$(scriptdir)|g' \
+ -e 's|@[EMAIL PROTECTED]|$(configdir)|g' \
+ -e 's|@[EMAIL PROTECTED]|$(docdir)|g'
+
READMES = \
README.battery \
README.cpufreq \
@@ -31,8 +40,11 @@
EXTRA_DIST = $(man_MANS) \
$(READMES) \
+ $(MAN_IN_FILES) \
powersave.tex
+CLEANFILES = $(man_MANS)
+
if DOCS_ENABLED
all:
@@ -51,7 +63,7 @@
# $(INSTALL_PROGRAM) -m 644 -D -d $(docdir)/$(docdir)/powersave
# $(INSTALL_PROGRAM) -m 644 -D $(top_builddir)/docs/powersave/* $(DESTDIR)/$(docdir)/powersave
-CLEANFILES = powersave_manual.txt powersave.html html/*
+CLEANFILES += powersave_manual.txt powersave.html html/*
uninstall-local:
rm $(DESTDIR)/$(docdir)/powersave_manual.txt
Index: daemon/Makefile.am
===================================================================
--- daemon/Makefile.am (Revision 2905)
+++ daemon/Makefile.am (Arbeitskopie)
@@ -1,6 +1,15 @@
sbin_PROGRAMS = powersaved
-INCLUDES= -I$(top_srcdir)/libpower $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS)
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/libpower \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ -DBIN_DIR=\""$(bindir)"\" \
+ -DCONFIG_DIR=\""$(configdir)"\" \
+ -DSCRIPT_DIR=\""$(scriptdir)"\" \
+ -DPUB_SCRIPT_DIR=\""$(pubscriptdir)"\" \
+ -DKDE_BINDIR=\""$(KDE_BINDIR)"\" \
+ -DGNOME_BINDIR=\""$(GNOME_BINDIR)"\"
powersaved_LDADD = $(top_builddir)/libpower/libpowersave.la \
$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(LIBLAZY_LIBS)
Index: configure.ac
===================================================================
--- configure.ac (Revision 2905)
+++ configure.ac (Arbeitskopie)
@@ -66,12 +66,6 @@
esac],[docs=false])
AM_CONDITIONAL(DOCS_ENABLED, test x$docs = xtrue)
-AC_ARG_ENABLE(doc-dir, AC_HELP_STRING([--enable-doc-dir=DIR],[Path to where documentation will be installed (also needs --enable-docs flag)]))
-if test -z "$enable_doc_dir" ; then
- docdir=\${prefix}/share/doc/packages/powersave
-else
- docdir="$enable_doc_dir"
-fi
# add check for buildenvironment
BUILD_ENVIRONMENT="no"
@@ -119,20 +113,14 @@
GNOME_BINDIR=$withval,
GNOME_BINDIR=[/opt/gnome/bin])
-AC_DEFINE_UNQUOTED(CONFIG_DIR, ["$sysconfdir/powersave"], [directory for configuration files])
-AC_DEFINE_UNQUOTED(SCRIPT_DIR, ["$libexecdir/powersave"], [directory for scripts])
-AC_DEFINE_UNQUOTED(PUB_SCRIPT_DIR, ["$libexecdir/powersave/scripts"], [directory for scripts])
-AC_DEFINE_UNQUOTED(BIN_DIR, ["$bindir"], [default bindir])
-AC_DEFINE_UNQUOTED(KDE_BINDIR, ["$KDE_BINDIR"], [kde bindir])
-AC_DEFINE_UNQUOTED(GNOME_BINDIR, ["$GNOME_BINDIR"], [gnome bindir])
-AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_SOCKET, ["$DBUS_SYSTEM_BUS_SOCKET"],
- [dbus system bus socket path])
AC_SUBST([configdir],$sysconfdir/powersave)
AC_SUBST([scriptdir],$libexecdir/powersave)
AC_SUBST([bindir],$bindir)
AC_SUBST([pubscriptdir],$libexecdir/powersave/scripts)
AC_SUBST([docdir])
+AC_SUBST([KDE_BINDIR])
+AC_SUBST([GNOME_BINDIR])
AC_SUBST([BUILD_ENVIRONMENT])
AC_SUBST([DEBUG_SCHEMES])
AC_SUBST([DBUS_LIBS])
@@ -162,14 +150,10 @@
docs/Makefile
docs/autodocs/Makefile
contrib/Makefile
- scripts/rcpowersaved
testsuite/Makefile
testsuite/linktests/Makefile
testsuite/testclient/Makefile
- scripts/setDefaultTrippoints.sh
- helpertools/Makefile
- docs/powersave.8
- docs/powersaved.8])
+ helpertools/Makefile])
AC_OUTPUT
signature.asc
Description: OpenPGP digital signature
_______________________________________________ powersave-devel mailing list [email protected] http://forge.novell.com/mailman/listinfo/powersave-devel
