2008/2/14, Dan Nicholson <[EMAIL PROTECTED]>: > Yes, nice! Updated patch attached. Another addition I made, is to install the defaults file as DATA, not SCRIPTS, as it doesn't contain any shell code (and no shebang).
Please review and apply. Cheers, Michae -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From 9fbde3095567e3a7ea6a9f14096e1185042d4b40 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[EMAIL PROTECTED]> Date: Thu, 14 Feb 2008 16:52:28 +0100 Subject: [PATCH] Clean up generated files and put *.in files in the tarball. Make sure to clean up all generated files on "make clean". Don't distribute generated files in the dist tarball, only the *.in files. Add generated files to .gitignore. Use consistend naming for the install dirs. Install defaults file as data file. Keep EXTRA_DIST and CLEANFILES in sync. --- pm/Makefile.am | 17 +++++++++-------- src/.gitignore | 1 + src/Makefile.am | 46 ++++++++++++++++------------------------------ 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/pm/Makefile.am b/pm/Makefile.am index 40617bd..d17ba35 100644 --- a/pm/Makefile.am +++ b/pm/Makefile.am @@ -3,22 +3,23 @@ SUBDIRS = \ power.d \ module.d -extradir = $(libdir)/pm-utils +pm_libdir = $(libdir)/pm-utils pm_sysconfdir = $(sysconfdir)/pm -extra_SCRIPTS = \ - functions \ - defaults +pm_lib_SCRIPTS = functions -CLEANFILES = functions +dist_pm_lib_DATA = defaults -EXTRA_DIST = \ - $(extra_SCRIPTS) +script_in_files = functions.in + +CLEANFILES = $(script_in_files:.in=) + +EXTRA_DIST = $(script_in_files) install-exec-local: -mkdir $(DESTDIR)$(sysconfdir)/pm/config.d -do_subst = sed -e 's,[EMAIL PROTECTED]@],$(extradir),g' \ +do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_libdir),g' \ -e 's,[EMAIL PROTECTED]@],$(pm_sysconfdir),g' SUFFIXES = .in diff --git a/src/.gitignore b/src/.gitignore index 208cd72..3418ee9 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -2,6 +2,7 @@ .libs *.o pm-action +pm-is-supported pm-pmu pm-powersave pm-reset-swap diff --git a/src/Makefile.am b/src/Makefile.am index 0497c86..1d7dd52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,38 +1,30 @@ -pm_utils_libdir = $(libdir)/pm-utils -pm_utils_bindir = $(pm_utils_libdir)/bin +pm_libdir = $(libdir)/pm-utils +pm_bindir = $(pm_libdir)/bin pm_sysconfdir = $(sysconfdir)/pm -pm_utils_bin_PROGRAMS = \ +pm_bin_PROGRAMS = \ pm-pmu \ pm-reset-swap -pm_utils_bin_SCRIPTS = \ - pm-action +pm_pmu_SOURCES = pm-pmu.c -pm_utils_usr_bindir = $(bindir) +pm_reset_swap_SOURCES = pm-reset-swap.c -pm_utils_usr_bin_SCRIPTS = \ - pm-is-supported +pm_bin_SCRIPTS = pm-action -pm_pmu_SOURCES = \ - pm-pmu.c +bin_SCRIPTS = pm-is-supported -pm_reset_swap_SOURCES = \ - pm-reset-swap.c +dist_bin_SCRIPTS = on_ac_power -extradir = $(sbindir) +sbin_SCRIPTS = pm-powersave -extra_SCRIPTS = \ - pm-powersave +script_in_files = pm-action.in pm-is-supported.in pm-powersave.in -acpowerdir = $(bindir) +CLEANFILES = $(script_in_files:.in=) -acpower_SCRIPTS = \ - on_ac_power +EXTRA_DIST = $(script_in_files) -CLEANFILES = $(pm_utils_bin_SCRIPTS) $(extra_SCRIPTS) - -do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_utils_libdir),g' \ +do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_libdir),g' \ -e 's,[EMAIL PROTECTED]@],$(pm_sysconfdir),g' SUFFIXES = .in @@ -43,15 +35,9 @@ SUFFIXES = .in install-data-hook: -mkdir -p $(DESTDIR)$(sbindir) - -ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend - -ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-hibernate - -ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend-hybrid - -EXTRA_DIST = \ - $(extra_SCRIPTS) \ - $(acpower_SCRIPTS) \ - $(pm_utils_bin_SCRIPTS) \ - $(pm_utils_usr_bin_SCRIPTS) + -ln -s $(pm_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend + -ln -s $(pm_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-hibernate + -ln -s $(pm_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend-hybrid clean-local : rm -f *~ -- 1.5.4.1
_______________________________________________ Pm-utils mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pm-utils
