diff options
author | marha <marha@users.sourceforge.net> | 2010-10-05 06:44:44 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-05 06:44:44 +0000 |
commit | 51f3d1e140307561f64c47dae1d44f912accb5cf (patch) | |
tree | 9432aedd19f670b1a72a1e8b4503f286fa910102 /apps/xclock/Makefile.am | |
parent | f07afca523ad174acd3c56fc43111a09b7a5243e (diff) | |
download | vcxsrv-51f3d1e140307561f64c47dae1d44f912accb5cf.tar.gz vcxsrv-51f3d1e140307561f64c47dae1d44f912accb5cf.tar.bz2 vcxsrv-51f3d1e140307561f64c47dae1d44f912accb5cf.zip |
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
Diffstat (limited to 'apps/xclock/Makefile.am')
-rw-r--r-- | apps/xclock/Makefile.am | 32 |
1 files changed, 8 insertions, 24 deletions
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) < $< > $@ |