diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-04-05 18:59:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-04-05 18:59:50 +0000 |
| commit | eca2f0e760d126f15a41a9d1306429526955f612 (patch) | |
| tree | 3fe447fed3732049157f3536cff238b2acd0d736 /app/xrdb/Makefile.am | |
| parent | c3c92c113aff78591beaab28e3b28bd27722a333 (diff) | |
Update to xrdb 1.0.9.
Includes a fix for CVE-2011-0465, to which OpenBSD is not vulnerable, since
dhclient will reject any hostname option containing invalid characters like
$ or `
Diffstat (limited to 'app/xrdb/Makefile.am')
| -rw-r--r-- | app/xrdb/Makefile.am | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/xrdb/Makefile.am b/app/xrdb/Makefile.am index 8cbacce57..251261b3f 100644 --- a/app/xrdb/Makefile.am +++ b/app/xrdb/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xrdb AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS) @@ -27,16 +28,7 @@ xrdb_LDADD = $(XRDB_LIBS) xrdb_SOURCES = \ xrdb.c -appman_PRE = \ - xrdb.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -48,8 +40,4 @@ ChangeLog: 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): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |