diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-05-31 20:23:20 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-05-31 20:23:20 +0000 |
| commit | f415fe4f147524975ea0def4934705388e074411 (patch) | |
| tree | cb6ac990634d27e26f3ba204413eb08b4feb624a /app/xinit/cpprules.in | |
| parent | 29015ca70850043409add64627eaa86633c66ef9 (diff) | |
Update to xinit 1.2.1
Diffstat (limited to 'app/xinit/cpprules.in')
| -rw-r--r-- | app/xinit/cpprules.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/xinit/cpprules.in b/app/xinit/cpprules.in index f32eafc06..18089dea7 100644 --- a/app/xinit/cpprules.in +++ b/app/xinit/cpprules.in @@ -23,7 +23,9 @@ MANDEFS = \ -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ - -D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \ + -D__XSERVERNAME__='$(XSERVERNAME)' \ + -D__XCONFIGFILE__='$(XCONFIGFILE)' \ + -D__XCONFIGFILEMAN__='$(XCONFIGFILEMAN)' \ -D__xinitdir__=$(XINITDIR) \ -D__bindir__=$(bindir) \ -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS) @@ -31,7 +33,7 @@ MANDEFS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp .cpp: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ .man.$(APP_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ |