diff options
Diffstat (limited to 'app/xlogo/Makefile.am')
| -rw-r--r-- | app/xlogo/Makefile.am | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/app/xlogo/Makefile.am b/app/xlogo/Makefile.am index e02f52e7c..36ab736e8 100644 --- a/app/xlogo/Makefile.am +++ b/app/xlogo/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xlogo -AM_CFLAGS = $(XLOGO_CFLAGS) +AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) xlogo_LDADD = $(XLOGO_LIBS) xlogo_SOURCES = \ @@ -54,27 +54,9 @@ 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): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |