summaryrefslogtreecommitdiff
path: root/package/util-macros
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-16 16:14:43 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-16 16:14:54 (GMT)
commit503659533a695a94a1591c3803080544f12e9a35 (patch)
tree4252d066e70ac971eac81e60beb82321de210a7d /package/util-macros
parent224199c2a01bb660242688aca506373e40b79775 (diff)
fix HOST_STYLE stuff, openjdk7 compile problems fixed
Diffstat (limited to 'package/util-macros')
-rw-r--r--package/util-macros/Makefile5
-rw-r--r--package/util-macros/patches/patch-Makefile_am11
-rw-r--r--package/util-macros/patches/patch-Makefile_in11
3 files changed, 2 insertions, 25 deletions
diff --git a/package/util-macros/Makefile b/package/util-macros/Makefile
index 676221d..db1a503 100644
--- a/package/util-macros/Makefile
+++ b/package/util-macros/Makefile
@@ -5,11 +5,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= util-macros
PKG_VERSION:= 1.18.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= fd0ba21b3179703c071bbb4c3e5fb0f4
PKG_DESCR:= xorg macros
PKG_SECTION:= x11/misc
-PKG_BUILDDEP:= autotool util-macros-host
PKG_URL:= http://cgit.freedesktop.org/xorg/util/macros
PKG_SITES:= http://xorg.freedesktop.org/archive/individual/util/
PKG_OPTS:= dev devonly
@@ -22,7 +21,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call HOST_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,UTIL_MACROS,util-macros,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-AUTOTOOL_STYLE:= autoreconf
+HOST_STYLE:= auto
include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/util-macros/patches/patch-Makefile_am b/package/util-macros/patches/patch-Makefile_am
deleted file mode 100644
index 40e2951..0000000
--- a/package/util-macros/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-macros-1.8.0.orig/Makefile.am 2010-03-29 17:47:02.000000000 +0200
-+++ util-macros-1.8.0/Makefile.am 2013-10-28 18:08:50.000000000 +0100
-@@ -29,7 +29,7 @@ dist_pkgdata_DATA = INSTALL
- install-data-hook:
- rm -f $(DESTDIR)$(aclocaldir)/xorgversion.m4
-
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = xorg-macros.pc
-
- .PHONY: ChangeLog
diff --git a/package/util-macros/patches/patch-Makefile_in b/package/util-macros/patches/patch-Makefile_in
deleted file mode 100644
index 1d47270..0000000
--- a/package/util-macros/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-macros-1.8.0.orig/Makefile.in 2010-05-27 21:02:01.000000000 +0200
-+++ util-macros-1.8.0/Makefile.in 2013-10-28 18:32:09.000000000 +0100
-@@ -167,7 +167,7 @@ top_srcdir = @top_srcdir@
- aclocaldir = $(datadir)/aclocal
- aclocal_DATA = xorg-macros.m4
- dist_pkgdata_DATA = INSTALL
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = xorg-macros.pc
- all: all-am
-