summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2008-11-10 19:51:13 +0100
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-11-28 03:22:40 -0200
commit8906fd92f85710d6d7eceac2fb5955e8c56eadcd (patch)
tree8147e4068c988123348779cb2c9c4d1d40f44db1
parent24c03bd379eb02abb5cfd88ce51a3a6714112d2f (diff)
enable VPATH build, reorganize app default files
-rw-r--r--Makefile.am22
-rw-r--r--app-defaults/Viewres (renamed from app-defaults/Viewres.ad)0
2 files changed, 5 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 755791a..d83a5ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,32 +30,20 @@ viewres_SOURCES = \
appman_PRE = \
viewres.man
-# App default files (*.ad)
+# App default files
appdefaultdir = @appdefaultdir@
-
-APPDEFAULTFILES = \
+dist_appdefault_DATA = \
app-defaults/Viewres
-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
@@ -76,7 +64,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/Viewres.ad b/app-defaults/Viewres
index 7272283..7272283 100644
--- a/app-defaults/Viewres.ad
+++ b/app-defaults/Viewres