diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-28 03:38:37 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-28 03:38:37 -0200 |
| commit | f1a527497c9621428cdb78dd9d37cb846ec10544 (patch) | |
| tree | 9d1c1f2e1226b4561359ecfb70ad600aaf33731e | |
| parent | 463bc71d330d357babb4981c933e6b615621c262 (diff) | |
enable VPATH build, reorganize app default files
Minor changes to http://bugs.freedesktop.org/attachment.cgi?id=20212.
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rw-r--r-- | app-defaults/XSm (renamed from app-defaults/XSm.ad) | 0 |
2 files changed, 5 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index ebdc346..f474fa3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,22 +66,13 @@ xsm_SOURCES = \ appman_PRE = \ xsm.man -# App default files (*.ad) +# App default files appdefaultdir = @appdefaultdir@ - -APPDEFAULTFILES = \ +dist_appdefault_DATA = \ app-defaults/XSm -SUFFIXES = .ad - -.ad: - [ -d app-defaults ] || mkdir app-defaults - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - # system init file systeminitdir = $(SYSTEM_INIT_DIR) @@ -90,9 +81,7 @@ systeminit_DATA = system.xsm # -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) globals.c system.xsm - -CLEANFILES = $(APPDEFAULTFILES) +EXTRA_DIST = globals.c system.xsm appmandir = $(APP_MAN_DIR) @@ -100,7 +89,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +CLEANFILES = $(appman_DATA) SED = sed @@ -121,7 +110,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/XSm.ad b/app-defaults/XSm index 5129722..5129722 100644 --- a/app-defaults/XSm.ad +++ b/app-defaults/XSm |