From 51f3d1e140307561f64c47dae1d44f912accb5cf Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 5 Oct 2010 06:44:44 +0000 Subject: Update to the following packages: - glproto-1.4.12 - kbproto-1.0.5 - renderproto-0.11.1 - xclock-1.0.5 - xextproto-7.1.2 - xproto-7.0.18 - xwininfo-1.1.0 --- apps/xclock/Makefile.am | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'apps/xclock/Makefile.am') diff --git a/apps/xclock/Makefile.am b/apps/xclock/Makefile.am index b2367b789..0f439761e 100644 --- a/apps/xclock/Makefile.am +++ b/apps/xclock/Makefile.am @@ -44,10 +44,10 @@ dist_appdefault_DATA = \ app-defaults/XClock EXTRA_DIST = \ - ChangeLog \ clmask.bit \ clock.bit +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(APPDEFAULTFILES) appmandir = $(APP_MAN_DIR) @@ -57,35 +57,19 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) CLEANFILES += $(appman_DATA) -MAINTAINERCLEANFILES=ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -- cgit v1.2.3