[pacman-dev] [PATCH 1/2] Makefile.am: Extract "contrib/" into DIST_SUBDIRS

Lukas Fleischer archlinux at cryptocrack.de
Mon Dec 12 16:36:56 EST 2011


This implies following changes:

* contrib scripts can be built and installed easily by running make(1)
  in "contrib/". This removes the need to pick all contrib scripts
  manually when packaging pacman-contrib.

* contrib scripts will no longer be built when running make(1) in the
  top level source directory. This seems like the most natural approach.
  We install those separately and should act the same when building
  stuff.

Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
---
Yes, I'm starting to become pushy! :) Seriously - this should do what we
discussed earlier. Dan, you can still hold it back...

 Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6b24a4a..a024a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,10 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util contrib
+SUBDIRS = lib/libalpm src/util src/pacman scripts etc test/pacman test/util
 if WANT_DOC
 SUBDIRS += doc
 endif
 
+DIST_SUBDIRS = $(SUBDIRS) contrib
+
 ACLOCAL_AMFLAGS = -I m4 --install
 
 # Make sure we test and build manpages when doing distcheck
-- 
1.7.8



More information about the pacman-dev mailing list