From ed6eede32a507daa779a1a0580681c3c7b333477 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <bdrung@ubuntu.com>
Date: Wed, 30 Dec 2009 00:58:00 +0100
Subject:   - Convert xpi-data-*.mk files into xul-app-data.csv* files for
 dh_xul-ext     - remove src/xpi-config.mk.in     - remove
 src/xpi-data-Debian.mk     - remove src/xpi-data-Ubuntu.mk     - remove
 src/xpi-data-all.mk     - remove src/xpi-data-common.mk     - add
 src/xul-app-data.csv.Debian     - add src/xul-app-data.csv.Ubuntu     -
 update src/Makefile

---
 src/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 2939e28..94449e4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -43,17 +43,12 @@ subst_files = \
 	mozclient.mk \
 	compare.mk \
 	minefield-packager.mk \
-	xpi-config.mk \
 	xulapp.mk \
 	$(NULL)
 
 extra_files = \
 	lp-locale-export.mk \
 	xpi.mk \
-	xpi-data-all.mk \
-	xpi-data-common.mk \
-	xpi-data-Debian.mk \
-	xpi-data-Ubuntu.mk \
 	$(NULL)
 
 bindir_files = \
@@ -76,7 +71,6 @@ extra_dirs = \
 	-e "s|^\(MOZCLIENT_EXCLUDE_SCRIPT.*=[ 	][ 	]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \
 	-e "s|^\(MOZCLIENT_PATCHES.*=[ 	][ 	]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \
 	-e "s|^\(MOZDEVSCRIPT_DIR.*=[ 	]*\)\(.*\)|\1$(DATADIR)/\2|" \
-	-e "s|@DISTRO@|$(shell lsb_release -si)|" \
 	> $@
 	chmod 644 $@
 
@@ -97,6 +91,7 @@ install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(
 	done
 	find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
 	chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
+	install -m 644 xul-app-data.csv.$(shell lsb_release -si) $(DESTDIR)$(DATADIR)/xul-app-data.csv
 
 install-man:
 	install -D -m 644 ../man/moz-version.1 $(DESTDIR)$(MANDIR)/man1/moz-version.1
-- 
cgit v1.2.3