summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-11-10 20:12:14 +0100
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-11-28 03:27:55 -0200
commit18323bb7de4573dc32ab38abe634d7035d9bf882 (patch)
tree5930ec9c2dea44e561aaa1e63ad01d5fabf0fc5d
parentac2f229757ee60eedeb0aeb0d3ed858cf26dfd07 (diff)
enable VPATH build, reorganize app default files
-rw-r--r--Makefile.am20
-rw-r--r--app-defaults/Xfd (renamed from app-defaults/Xfd.ad)2
2 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index e07348d..dbfbeb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,31 +33,21 @@ xfd_SOURCES = \
appman_PRE = \
xfd.man
-# App default files (*.ad)
+# App default files
appdefaultdir = @appdefaultdir@
-APPDEFAULTFILES = \
+dist_appdefault_DATA = \
app-defaults/Xfd
-SUFFIXES = .ad
-
-.ad:
- cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
-
-CLEANFILES = $(APPDEFAULTFILES)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
SED = sed
@@ -78,7 +68,7 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
diff --git a/app-defaults/Xfd.ad b/app-defaults/Xfd
index 29ff522..8b738c8 100644
--- a/app-defaults/Xfd.ad
+++ b/app-defaults/Xfd
@@ -16,7 +16,7 @@
*next16.Label: +16
*select.Label: Select a character
-*metrics.Label:
+*metrics.Label:
*select.Justify: center
*metrics.Justify: center
*range.Justify: left