diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-12-16 20:34:34 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-12-16 20:34:34 +0100 |
| commit | 54787d6595083b9fd3e4dd220febe17821a1438c (patch) | |
| tree | bbb68c24e31602603f2c30538b70bd4b0809623b | |
| parent | cbb1b924cc49659a27cd10cbaaf94e3746bd8736 (diff) | |
Merge from obsd tree
- install pkg config file to $(libdir)/pkgconfig
- disable xmlto
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.bsd-wrapper | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 38c34c3..f11440d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,10 +10,10 @@ Xtransinclude_HEADERS = \ Xtransutil.c \ transport.c -aclocaldir = $(datadir)/aclocal +aclocaldir = $(libdir)/aclocal aclocal_DATA = xtrans.m4 -pkgconfigdir = $(datadir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xtrans.pc MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/Makefile.bsd-wrapper b/Makefile.bsd-wrapper index 83b7928..7a2f498 100644 --- a/Makefile.bsd-wrapper +++ b/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/26 12:07:34 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2012/03/10 18:41:37 matthieu Exp $ -CONFIGURE_ARGS += --without-groff +CONFIGURE_ARGS += --without-fop --without-xmlto .include <bsd.xorg.mk> |