From ed39212ecf461e6409c7882a6a7b5fc45ea4c03f Mon Sep 17 00:00:00 2001 From: Fabien Tassin Date: Mon, 24 Mar 2008 02:59:57 +0100 Subject: * [ minefield-packager ] + New module creating debs from Firefox nightly built tarballs - add src/minefield-packager.mk.in - add src/minefield-packager/debian/* - update src/Makefile - update README * Add $(extra_mk_dirs) to install a full directory and use it for minefield-packager/debian and (mozclient/)patches - update src/Makefile --- src/Makefile | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 7d32611..4aa247e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,6 +32,7 @@ mk_files = \ xulrunner-1.9.mk \ mozclient.mk \ compare.mk \ + minefield-packager.mk \ $(NULL) extra_mk_files = \ @@ -40,22 +41,29 @@ extra_mk_files = \ lp-locale-export.mk \ $(NULL) +extra_mk_dirs = \ + patches \ + minefield-packager/debian \ + $(NULL) + %.mk: %.mk.in cat $< | sed \ -e "s|^\(include\) \(.*\)\.in|\1 $(DATADIR)/\2|" \ -e "s|^\(MOZCLIENT_EXCLUDE_SCRIPT.*=[ ][ ]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \ -e "s|^\(MOZCLIENT_PATCHES.*=[ ][ ]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \ + -e "s|^\(MOZDEVSCRIPT_DIR.*=[ ]*\)\(.*\)|\1$(DATADIR)/\2|" \ > $@ chmod 644 $@ build: $(mk_files) -install: $(mk_files) $(extra_mk_files) - install -m 755 -d $(DESTDIR)$(DATADIR) - install -m 644 $^ $(DESTDIR)$(DATADIR) +install: $(mk_files) $(extra_mk_files) $(foreach dir,$(extra_mk_dirs),$(wildcard $(dir)/*)) + install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_mk_dirs),$(DESTDIR)$(DATADIR)/$(dir)) + install -m 644 $(mk_files) $(extra_mk_files) $(DESTDIR)$(DATADIR) chmod 755 $(DESTDIR)$(DATADIR)/*.sh - install -m 755 -d $(DESTDIR)$(DATADIR)/patches - install -m 644 $(wildcard ./patches/*) $(DESTDIR)$(DATADIR)/patches + for dir in $(extra_mk_dirs) ; do \ + install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \ + done clean: rm -f $(mk_files) -- cgit v1.2.3