From a347ddc5148ab2f95f2f409a90aced0e48b36c37 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 24 Oct 2009 15:00:52 +0000
Subject: Update to xman 1.1.0

---
 app/xman/Makefile.am | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'app/xman/Makefile.am')

diff --git a/app/xman/Makefile.am b/app/xman/Makefile.am
index 1b4de74d4..91ffb8128 100644
--- a/app/xman/Makefile.am
+++ b/app/xman/Makefile.am
@@ -24,7 +24,8 @@ bin_PROGRAMS = xman
 helpdir=@HELPDIR@
 dist_help_DATA = xman.help
 
-xman_CFLAGS = $(XMAN_CFLAGS) -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
+AM_CFLAGS = $(CWARNFLAGS) $(XMAN_CFLAGS) \
+	-D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
 xman_LDADD = $(XMAN_LIBS)
 
 xman_SOURCES =	\
@@ -50,39 +51,23 @@ xman_SOURCES =	\
         vendor.h \
         version.h
 
-if XAW_USE_XPRINT
-xman_SOURCES += \
-        print.c \
-        print.h
-endif
-
 appman_PRE = \
         xman.man
 
-# App default files  (*.ad)
-
-appdefaultdir = @appdefaultdir@
+# App default files
 
-if XAW_USE_XPRINT
-Xman: Xman-xprint.ad
-	ln -s $(top_srcdir)/Xman-xprint.ad Xman
-else
-Xman: Xman-noxprint.ad
-	ln -s $(top_srcdir)/Xman-noxprint.ad Xman
-endif
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
-appdefault_DATA = Xman
-
-EXTRA_DIST = Xman-xprint.ad Xman-noxprint.ad
+appdefaultdir = @appdefaultdir@
 
-CLEANFILES = Xman
+dist_appdefault_DATA = app-defaults/Xman
 
 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
 
@@ -106,4 +91,14 @@ MAN_SUBSTS = \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
-- 
cgit v1.2.3