diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 19:37:34 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 19:37:34 +0000 |
commit | ae704006b56a4b65aa419322419e05a2b2f671e9 (patch) | |
tree | 9514a44eef0b70d3524a05c2fc9c190c778ff980 /app/xfsinfo/Makefile.am | |
parent | fdf2aa9d72d98f765c4e3cb1ec47778e4bcb5c0b (diff) |
Update to xfsinfo 1.0.3
Diffstat (limited to 'app/xfsinfo/Makefile.am')
-rw-r--r-- | app/xfsinfo/Makefile.am | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/app/xfsinfo/Makefile.am b/app/xfsinfo/Makefile.am index c498ddb31..a092f8496 100644 --- a/app/xfsinfo/Makefile.am +++ b/app/xfsinfo/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xfsinfo -AM_CFLAGS = $(XFSINFO_CFLAGS) +AM_CFLAGS = $(XFSINFO_CFLAGS) $(CWARNFLAGS) xfsinfo_LDADD = $(XFSINFO_LIBS) xfsinfo_SOURCES = \ @@ -36,38 +36,22 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -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' - 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) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL |