diff options
Diffstat (limited to 'app/setxkbmap/Makefile.am')
| -rw-r--r-- | app/setxkbmap/Makefile.am | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/app/setxkbmap/Makefile.am b/app/setxkbmap/Makefile.am index 2c2bebf4c..a292290d2 100644 --- a/app/setxkbmap/Makefile.am +++ b/app/setxkbmap/Makefile.am @@ -23,8 +23,7 @@ bin_PROGRAMS = setxkbmap XKBCONFIGROOT=@XKBCONFIGROOT@ -AM_CFLAGS = $(SETXKBMAP_CFLAGS) \ - -D__XKBDEFRULES__='"xorg"' \ +AM_CFLAGS = $(CWARNFLAGS) $(SETXKBMAP_CFLAGS) \ -DDFLT_XKB_CONFIG_ROOT=\"$(XKBCONFIGROOT)\" setxkbmap_LDADD = $(SETXKBMAP_LIBS) @@ -38,40 +37,29 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -.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 +dist-hook: ChangeLog INSTALL -MAN_SUBSTS = \ +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +setxkbmap_MAN_SUBSTS = \ -e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' \ - -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' + $(MAN_SUBSTS) SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(setxkbmap_MAN_SUBSTS) < $< > $@ if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |