[Pkg-mailman-hackers] Pkg-mailman commit - rev 400 - trunk/debian/patches

[Thijs Kinkhorst]

Author: thijs
Date: 2006-09-24 13:28:52 +0000 (Sun, 24 Sep 2006)
New Revision: 400

Added:
   trunk/debian/patches/81_build_arch_indep.patch
Modified:
   trunk/debian/patches/series
Log:
Split the Makefile targets into arch-dep and arch-indep so we can install
them into different packages. Based on previous work from Siggy Bentrup.

I've forwarded this to the upstream patches tracker already.



Added: trunk/debian/patches/81_build_arch_indep.patch
===================================================================
--- trunk/debian/patches/81_build_arch_indep.patch	                        (rev 0)
+++ trunk/debian/patches/81_build_arch_indep.patch	2006-09-24 13:28:52 UTC (rev 400)
@@ -0,0 +1,106 @@
+Patch: build_arch_indep.patch
+Author: Thijs Kinkhorst <thijs at debian.org>, based on work from Siggy Bentrup.
+Split the Makefile targets into arch-dep and arch-indep so we can install
+them into different packages.
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig	2006-09-24 15:11:22.000000000 +0200
++++ Makefile.in	2006-09-24 15:17:49.000000000 +0200
+@@ -55,8 +55,9 @@
+ ARCH_DEP_DIRS=	cgi-bin mail
+ 
+ # Directories make should decend into
+-SUBDIRS=	bin cron misc Mailman scripts src templates messages tests
+-
++ARCH_SUBDIRS  = src
++INDEP_SUBDIRS = bin cron misc Mailman scripts templates messages tests
++SUBDIRS       = $(ARCH_SUBDIRS) $(INDEP_SUBDIRS)
+ 
+ # Modes for directories and executables created by the install
+ # process.  Default to group-writable directories but
+@@ -73,21 +74,29 @@
+ 
+ # Rules
+ 
+-all: subdirs
++all: arch-subdirs indep-subdirs
+ 
+-subdirs: $(SUBDIRS)
+-	for d in $(SUBDIRS); \
++arch-subdirs: $(ARCH_SUBDIRS)
++	for d in $(ARCH_SUBDIRS); \
+ 	do \
+ 	    (cd $$d; $(MAKE)); \
+ 	done
+ 
+-install: doinstall update
++indep-subdirs: $(INDEP_SUBDIRS)
++	for d in $(INDEP_SUBDIRS); \
++	do \
++	    (cd $$d; $(MAKE)); \
++	done
+ 
+-doinstall: $(SUBDIRS)
+-	@echo "Creating architecture independent directories..."
+-	@for d in $(VAR_DIRS); \
++install: do-arch-install do-indep-install update
++# Backwards-compatibility:
++doinstall: do-arch-install do-indep-install
++
++do-arch-install: $(ARCH_SUBDIRS)
++	@echo "Creating architecture dependent directories..."
++	@for d in $(ARCH_DEP_DIRS); \
+ 	do \
+-	    dir=$(DESTDIR)$(var_prefix)/$$d; \
++	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
+ 	    if test ! -d $$dir; then \
+ 		echo "Creating directory hierarchy $$dir"; \
+ 		$(srcdir)/mkinstalldirs $$dir; \
+@@ -96,10 +105,16 @@
+ 	    else true; \
+ 	    fi; \
+ 	done
+-	chmod o-r $(DESTDIR)$(var_prefix)/archives/private
+-	@for d in $(ARCH_INDEP_DIRS); \
++	@for d in $(ARCH_SUBDIRS); \
+ 	do \
+-	    dir=$(DESTDIR)$(prefix)/$$d; \
++	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
++	done
++
++do-indep-install: $(INDEP_SUBDIRS)
++	@echo "Creating architecture independent directories..."
++	@for d in $(VAR_DIRS); \
++	do \
++	    dir=$(DESTDIR)$(var_prefix)/$$d; \
+ 	    if test ! -d $$dir; then \
+ 		echo "Creating directory hierarchy $$dir"; \
+ 		$(srcdir)/mkinstalldirs $$dir; \
+@@ -108,10 +123,10 @@
+ 	    else true; \
+ 	    fi; \
+ 	done
+-	@echo "Creating architecture dependent directories..."
+-	@for d in $(ARCH_DEP_DIRS); \
++	chmod o-r $(DESTDIR)$(var_prefix)/archives/private
++	@for d in $(ARCH_INDEP_DIRS); \
+ 	do \
+-	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
++	    dir=$(DESTDIR)$(prefix)/$$d; \
+ 	    if test ! -d $$dir; then \
+ 		echo "Creating directory hierarchy $$dir"; \
+ 		$(srcdir)/mkinstalldirs $$dir; \
+@@ -120,11 +135,11 @@
+ 	    else true; \
+ 	    fi; \
+ 	done
+-	@for d in $(SUBDIRS); \
++	@for d in $(INDEP_SUBDIRS); \
+ 	do \
+ 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
+ 	done
+-	#$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
++	$(PYTHON) -c 'from compileall import *; compile_dir("$(DESTDIR)$(prefix)/Mailman")'
+ 
+ # Only run bin/update if we aren't installing in DESTDIR, as this
+ # means there are probably no lists to deal with, and it wouldn't

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-09-24 12:30:30 UTC (rev 399)
+++ trunk/debian/patches/series	2006-09-24 13:28:52 UTC (rev 400)
@@ -35,4 +35,5 @@
 78_DeprecationWarning.patch -p0
 79_archiver_slash.patch -p0
 80_fix_string_search.patch -p0
+81_build_arch_indep.patch -p0
 99_js_templates.patch -p0