diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/libtasn1 | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/libtasn1')
| -rw-r--r-- | package/libtasn1/Makefile | 2 | ||||
| -rw-r--r-- | package/libtasn1/patches/patch-Makefile_in | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index d48c4bc38..8b82f4b42 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -16,6 +16,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTASN1,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-gtk-doc-html + post-install: ${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib ${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib diff --git a/package/libtasn1/patches/patch-Makefile_in b/package/libtasn1/patches/patch-Makefile_in new file mode 100644 index 000000000..53b3093ab --- /dev/null +++ b/package/libtasn1/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- libtasn1-2.2.orig/Makefile.in 2009-05-20 12:03:47.000000000 +0200 ++++ libtasn1-2.2/Makefile.in 2010-10-05 22:41:43.000000000 +0200 +@@ -446,7 +446,7 @@ EXTRA_DIST = windows/asn1-parser/asn1-pa + windows/libtasn1/libtasn1.vcproj \ + windows/test-parser/test-parser.vcproj \ + windows/test-tree/test-tree.vcproj cfg.mk maint.mk .clcopying +-SUBDIRS = gl lib src examples tests doc ++SUBDIRS = gl lib src examples tests + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/glm4 + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive |