summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-23 21:32:26 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-23 21:32:26 +0000
commit09d6aaa4292e2a9017cc1f4a91e1b062e5766a87 (patch)
tree89e301923e8b7f22fe615258da3a67f2dcc59183
parent5bed580a99a1eb5c30624ffc76593292c0cd3d66 (diff)
Do .ad files in a more convoluted way (strip .ad when installing)
-rw-r--r--Makefile.am25
-rw-r--r--configure.ac2
2 files changed, 21 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index ccb3947..b371a4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,12 +24,27 @@ bin_PROGRAMS = beforelight
beforelight_CFLAGS = $(DEP_CFLAGS)
beforelight_LDADD = $(DEP_LIBS)
-beforelight_SOURCES = \
- b4light.c
+beforelight_SOURCES = \
+ b4light.c \
+ config.h
dist_man_MANS = \
- b4light.man
+ b4light.man
-app_defaultdir = $(sysconfdir)/X11/app-defaults
+# App default files (*.ad)
+
+appdefaultdir = $(sysconfdir)/X11/app-defaults
+
+EXTRA_DIST = \
+ B4light.ad
+
+APPDEFAULTFILES = \
+ B4light
+
+$(APPDEFAULTFILES): %: %.ad
+ cp $< $@
+
+appdefault_DATA = $(APPDEFAULTFILES)
+
+CLEANFILES = $(APPDEFAULTFILES)
-dist_app_default_DATA = B4light.ad
diff --git a/configure.ac b/configure.ac
index 534eb62..23af480 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_PROG_CC
AC_PROG_INSTALL
# Checks for pkg-config packages
-PKG_CHECK_MODULES(DEP, x11 xt xscrnsaver)
+PKG_CHECK_MODULES(DEP, x11 xscrnsaver xt)
AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)