fix foreach issue in makefile

[debbugs.git] / Makefile

diff --git a/Makefile b/Makefile
index 4dad84022d0ac0b5829d19fcad034a8093d784cc..152e75099ce994e117c0b2e9ac5e9e8f44a2d1de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,12 @@ var_dir               := $(DESTDIR)/var/lib/debbugs
 scripts_dir    := $(DESTDIR)/usr/lib/debbugs
 perl_dir       := $(DESTDIR)/usr/share/perl5/Debbugs
 doc_dir                := $(DESTDIR)/usr/share/doc/debbugs
+templates_dir  := $(DESTDIR)/usr/share/debbugs/templates
 man_dir                := $(DESTDIR)/usr/share/man
 man8_dir       := $(man_dir)/man8
 examples_dir   := $(doc_dir)/examples
 
-scripts_in     := $(filter-out scripts/config.in scripts/errorlib.in scripts/text.in, $(wildcard scripts/*.in))
+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)
 
@@ -37,22 +38,23 @@ 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)/$(patsubst scripts/%.in,%,$(script));)
-       $(install_data) scripts/errorlib.in $(scripts_dir)/errorlib
+       $(foreach script,$(scripts_in), $(exec $(install_exec) $(script) $(scripts_dir)/$(script)))
+       $(install_data) scripts/errorlib $(scripts_dir)/errorlib
 
        # install examples
-       $(install_data) scripts/config.in $(examples_dir)/config
+       $(install_data) scripts/config $(examples_dir)/config
        $(install_data) scripts/config.debian $(examples_dir)/config.debian
-       $(install_data) scripts/text.in $(examples_dir)/text
+       $(install_data) scripts/text $(examples_dir)/text
        $(install_data) debian/crontab misc/nextnumber misc/Maintainers \
          misc/Maintainers.override misc/pseudo-packages.description \
          misc/sources $(examples_dir)
@@ -65,7 +67,7 @@ $(var_dir)/spool/db-h $(scripts_dir) $(perl_dir) $(examples_dir) $(man8_dir); \
 
        # install the CGIs
        for cgi in $(cgis); do $(install_exec) $$cgi $(var_dir)/www/cgi; done
-       $(install_exec) cgi/bugs-fetch2.pl.in $(var_dir)/www/cgi/bugs-fetch2.pl
+       $(install_exec) cgi/bugs-fetch2.pl $(var_dir)/www/cgi/bugs-fetch2.pl
 
 #      # install Perl modules
 #      for perl in $(perls); do $(install_data) $$perl $(perl_dir); done
@@ -83,4 +85,9 @@ $(var_dir)/spool/db-h $(scripts_dir) $(perl_dir) $(examples_dir) $(man8_dir); \
        # install the updateseqs file
        $(install_data) misc/updateseqs $(var_dir)/spool
 
+       # install the templates
+       $(foreach dir, $(wildcard templates/*/*), $(exec -d $(install_exec) $(template_dir)/$(patsubst templates/%,%,$(dir))))
+       $(foreach tmpl, $(wildcard templates/*/*/*.tmpl), $(exec $(install_data) $(tmpl) $(template_dir)/$(patsubst templates/%,%,$(tmpl))))
+
+
 .PHONY: test
\ No newline at end of file