From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 16 Aug 2008 19:17:57 +0000 (-0700)
Subject: fix the makefile to install the perl bits correctly; don't make the db-h spool direct... 
X-Git-Tag: release/2.6.0~472^2~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=850abe6dc2aa125b6b29567aa0290fa0ce77f6ff;p=debbugs.git

fix the makefile to install the perl bits correctly; don't make the db-h spool directories
---

diff --git a/Makefile b/Makefile
index d1185b6..f2cdf3d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ man_dir		:= $(DESTDIR)/usr/share/man
 man8_dir	:= $(man_dir)/man8
 examples_dir	:= $(doc_dir)/examples
 
-scripts_in	:= $(filter-out scripts/config scripts/errorlib scripts/text, $(wildcard scripts/*))
+scripts_in	:= $(foreach script, $(filter-out scripts/config scripts/errorlib scripts/text, $(wildcard scripts/*)),$(patsubst scripts/%,%,$(script)))
 htmls_in	:= $(wildcard html/*.html.in)
 cgis		:= $(wildcard cgi/*.cgi cgi/*.pl)
 
@@ -38,17 +38,17 @@ install_mostfiles:
 	for dir in $(sbin_dir) $(etc_dir)/html $(etc_dir)/indices \
 $(var_dir)/indices $(var_dir)/www/cgi $(var_dir)/www/db $(var_dir)/www/txt \
 $(var_dir)/spool/lock $(var_dir)/spool/archive $(var_dir)/spool/incoming \
-$(var_dir)/spool/db-h $(scripts_dir) $(perl_dir) $(examples_dir) $(man8_dir); \
+$(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
           do test -d $$dir || $(install_exec) -d $$dir; done
-
+# we shouldn't ship db-h spool directories
 	# make db-h spool dirs if they don't exist
-	cd $(var_dir)/spool/db-h; \
-	  for dir in $(shell seq -w 00 99); \
-	    do test -d $$dir || $(install_exec) -d $$dir; done
+#	cd $(var_dir)/spool/db-h; \
+#	  for dir in $(shell seq -w 00 99); \
+#	    do test -d $$dir || $(install_exec) -d $$dir; done
 
 
 	# install the scripts
-	$(foreach script,$(scripts_in), $(install_exec) $(script) $(scripts_dir)/$(script);)
+	$(foreach script,$(scripts_in), $(exec $(install_exec) $(script) $(scripts_dir)/$(script)))
 	$(install_data) scripts/errorlib $(scripts_dir)/errorlib
 
 	# install examples
@@ -86,8 +86,8 @@ $(var_dir)/spool/db-h $(scripts_dir) $(perl_dir) $(examples_dir) $(man8_dir); \
 	$(install_data) misc/updateseqs $(var_dir)/spool
 
 	# install the templates
-	$(foreach dir $(wildcard templates/*/*) $(install_exec) $(template_dir)/$(patsubst templates/%,%,$(dir)))
-	$(foreach tmpl $(wildcard templates/*/*/*.tmpl) $(install_data) $(template_dir)/$(patsubst templates/%,%,$(tmpl)))
+	$(foreach dir, $(wildcard templates/*/*), $(exec $(install_exec) $(template_dir)/$(patsubst templates/%,%,$(dir))))
+	$(foreach tmpl, $(wildcard templates/*/*/*.tmpl), $(exec $(install_data) $(template_dir)/$(patsubst templates/%,%,$(tmpl))))
 
 
 .PHONY: test
\ No newline at end of file