Index: configure.in
===================================================================
--- configure.in	(revision 31169)
+++ configure.in	(working copy)
@@ -607,6 +607,29 @@
 AC_SUBST(ABIWORD_ICONDIR, "$abi_cv_icondir") 	     
 
 
+# create DATA lists
+
+for f in `ls po/*.po`; do
+	ABIWORD_STRINGSFILES="$ABIWORD_STRINGSFILES `echo "$f" | sed 's:^po/\(.*\)\.po$:\1.strings:'`"
+done
+AC_SUBST(ABIWORD_STRINGSFILES)
+
+for f in `ls user/wp/system.profile*`; do
+	ABIWORD_PROFILES="$ABIWORD_PROFILES `echo "$f" | sed 's:^user/wp/::'`"
+done
+AC_SUBST(ABIWORD_PROFILES)
+
+for f in `ls user/wp/templates/normal*`; do
+	ABIWORD_TEMPLATES_NORMAL="$ABIWORD_TEMPLATES_NORMAL `echo "$f" | sed 's:^user/wp/templates/::'`"
+done
+AC_SUBST(ABIWORD_TEMPLATES_NORMAL)
+
+for f in `ls user/wp/templates/*.awt`; do
+	ABIWORD_TEMPLATES_EXTRA="$ABIWORD_TEMPLATES_EXTRA `echo "$f" | sed 's:^user/wp/templates/::'`"
+done
+AC_SUBST(ABIWORD_TEMPLATES_EXTRA)
+
+
 #
 # Compiler settings (from gnumeric's configure.in)
 #
Index: po/Makefile.am
===================================================================
--- po/Makefile.am	(revision 31169)
+++ po/Makefile.am	(working copy)
@@ -1,94 +1,9 @@
 CLEANFILES = $(strings_DATA)
 EXTRA_DIST = $(strings_DATA)
 stringsdir = $(ABIWORD_DATADIR)/strings
+strings_DATA = $(ABIWORD_STRINGSFILES)
 
 UIBACKPORT = $(srcdir)/ui-backport.pl
 
-strings_DATA = \
-	ach.strings \
-	af-ZA.strings \
-	ak.strings \
-	am-ET.strings \
-	ar.strings \
-	ast-ES.strings \
-	ayc-BO.strings \
-	aym-BO.strings \
-	be-BY.strings \
-	be@latin.strings \
-	bg-BG.strings \
-	br-FR.strings \
-	ca-ES.strings \
-	cgg.strings \
-	cs-CZ.strings \
-	cy-GB.strings \
-	da-DK.strings \
-	de-CH.strings \
-	de-DE.strings \
-	el-GR.strings \
-	en-AU.strings \
-	en-CA.strings \
-	en-GB.strings \
-	en-IE.strings \
-	eo.strings \
-	es-ES.strings \
-	es-MX.strings \
-	et.strings \
-	eu-ES.strings \
-	ff.strings \
-	fi-FI.strings \
-	fr-FR.strings \
-	ga-IE.strings \
-	gl.strings \
-	he-IL.strings \
-	hr-HR.strings \
-	hu-HU.strings \
-	id-ID.strings \
-	it-IT.strings \
-	ja-JP.strings \
-	jbo.strings \
-	kk-KZ.strings \
-	ko.strings \
-	ku.strings \
-	lg.strings \
-	lt-LT.strings \
-	lv-LV.strings \
-	mg-MG.strings \
-	mk-MK.strings \
-	mnk-SN.strings \
-	ms-MY.strings \
-	nb-NO.strings \
-	ne-NP.strings \
-	nl-NL.strings \
-	nn-NO.strings \
-	pl-PL.strings \
-	ps.strings \
-	pt-BR.strings \
-	pt-PT.strings \
-	quh-BO.strings \
-	qul-BO.strings \
-	quz.strings \
-	ro-RO.strings \
-	ru-RU.strings \
-	sc-IT.strings \
-	sk-SK.strings \
-	sl-SI.strings \
-	son.strings \
-	sq-AL.strings \
-	sr@latin.strings \
-	sr.strings \
-	sv-SE.strings \
-	sw.strings \
-	ta-IN.strings \
-	th.strings \
-	tr-TR.strings \
-	uk-UA.strings \
-	vi-VN.strings \
-	wo-SN.strings \
-	yi.strings \
-	zh-CN.strings \
-	zh-HK.strings \
-	zh-TW.strings \
-	zu.strings
-
 .po.strings:
 	@$(UIBACKPORT) $< $@
Index: user/wp/Makefile.am
===================================================================
--- user/wp/Makefile.am	(revision 31169)
+++ user/wp/Makefile.am	(working copy)
@@ -10,79 +10,4 @@
 	$(wp_DATA)
 
 wpdir = $(ABIWORD_DATADIR)
-wp_DATA = \
-	readme.txt \
-	readme.abw \
-	system.profile \
-	system.profile-am-ET \
-	system.profile-ar \
-	system.profile-ar-EG \
-	system.profile-ar-SA \
-	system.profile-bg-BG \
-	system.profile-ca-ES \
-	system.profile-CP1254 \
-	system.profile-cs-CZ \
-	system.profile-da-DK \
-	system.profile-de \
-	system.profile-de-AT \
-	system.profile-de-CH \
-	system.profile-de-DE \
-	system.profile-div-MV \
-	system.profile-el-GR \
-	system.profile-en \
-	system.profile-en-AU \
-	system.profile-en-CA \
-	system.profile-en-GB \
-	system.profile-en-IE \
-	system.profile-en-NZ \
-	system.profile-en-US \
-	system.profile-en-ZA \
-	system.profile-es \
-	system.profile-es-ES \
-	system.profile-es-MX \
-	system.profile-eu \
-	system.profile-eu-ES \
-	system.profile-fa-IR \
-	system.profile-fi-FI \
-	system.profile-fr \
-	system.profile-fr-BE \
-	system.profile-fr-CA \
-	system.profile-fr-CH \
-	system.profile-fr-FR \
-	system.profile-gl-ES \
-	system.profile-he \
-	system.profile-he-IL \
-	system.profile-hu-HU \
-	system.profile-it-IT \
-	system.profile-ja-JP \
-	system.profile-kk-KZ \
-	system.profile-KOI8-R \
-	system.profile-KOI8-U \
-	system.profile-KOI8-UB \
-	system.profile-lt-LT \
-	system.profile-nb-NO \
-	system.profile-nl-NL \
-	system.profile-nn-NO \
-	system.profile-ro \
-	system.profile-ro-RO \
-	system.profile-pl-PL \
-	system.profile-ps \
-	system.profile-pt-BR \
-	system.profile-pt-PT \
-	system.profile-ru \
-	system.profile-ru-RU \
-	system.profile-sk-SK \
-	system.profile-sk-SK.CP1250 \
-	system.profile-sl \
-	system.profile-sv \
-	system.profile-sv-SE \
-	system.profile-syr \
-	system.profile-tr \
-	system.profile-tr-TR \
-	system.profile-tr-TR.CP1254 \
-	system.profile-uk-UA \
-	system.profile-ur-PK \
-	system.profile-yi \
-	system.profile-zh-CN \
-	system.profile-zh-TW
-
+wp_DATA = readme.txt readme.abw $(ABIWORD_PROFILES)
Index: user/wp/templates/Makefile.am
===================================================================
--- user/wp/templates/Makefile.am	(revision 31169)
+++ user/wp/templates/Makefile.am	(working copy)
@@ -1,82 +1,7 @@
 
-templates_normal = \
-	normal.awt \
-	normal.awt-am_ET \
-	normal.awt-ar \
-	normal.awt-ar_EG \
-	normal.awt-ar_SA \
-	normal.awt-bg_BG \
-	normal.awt-ca_ES \
-	normal.awt-cs_CZ \
-	normal.awt-da_DK \
-	normal.awt-de \
-	normal.awt-de_AT \
-	normal.awt-de_CH \
-	normal.awt-de_DE \
-	normal.awt-div_MV \
-	normal.awt-el_GR \
-	normal.awt-en_AU \
-	normal.awt-en_CA \
-	normal.awt-en_GB \
-	normal.awt-en_IE \
-	normal.awt-en_NZ \
-	normal.awt-en_ZA \
-	normal.awt-es \
-	normal.awt-es_AR \
-	normal.awt-es_ES \
-	normal.awt-es_IR \
-	normal.awt-es_MX \
-	normal.awt-fa_IR \
-	normal.awt-fi_FI \
-	normal.awt-fr \
-	normal.awt-fr_BE \
-	normal.awt-fr_CA \
-	normal.awt-fr_CH \
-	normal.awt-fr_FR \
-	normal.awt-gl_ES \
-	normal.awt-he \
-	normal.awt-he_IL \
-	normal.awt-hu_HU \
-	normal.awt-it_IT \
-	normal.awt-ja_JP \
-	normal.awt-lt_LT \
-	normal.awt-nb_NO \
-	normal.awt-nl_NL \
-	normal.awt-nn_NO \
-	normal.awt-pl_PL \
-	normal.awt-ro \
-	normal.awt-ro_RO \
-	normal.awt-ps \
-	normal.awt-pt_BR \
-	normal.awt-pt_PT \
-	normal.awt-ru \
-	normal.awt-ru_RU \
-	normal.awt-sk_SK \
-	normal.awt-sl \
-	normal.awt-sv \
-	normal.awt-sv_SE \
-	normal.awt-syr \
-	normal.awt-tr \
-	normal.awt-tr_TR \
-	normal.awt-uk_UA \
-	normal.awt-ur_PK \
-	normal.awt-yi \
-	normal.awt-zh_CN \
-	normal.awt-zh_TW
+templates_normal = $(ABIWORD_TEMPLATES_NORMAL)
+templates_extra = $(ABIWORD_TEMPLATES_EXTRA)
 
-templates_extra = \
-	A4.awt \
-	Business-Letter.awt \
-	Business-Report.awt \
-	Employee-Directory.awt \
-	Fax-Coversheet.awt \
-	Friendly-Letter.awt \
-	Memo.awt \
-	Press-Release.awt \
-	Resume.awt \
-	Two-Columns.awt \
-	US-Letter.awt
-
 templatesdir = $(ABIWORD_DATADIR)/templates
 templates_DATA = $(templates_normal)
 if ENABLE_TEMPLATES