diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-06-21 09:00:58 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-06-21 09:00:58 +0000 |
| commit | b17a019844e5d5f2de10a086b89101b38b09faa5 (patch) | |
| tree | 1d1ad56ffe1bc81d95b8908d3ffe44ada612f26a /packages/libftdi | |
| parent | 7ebefcff1fdc6993a30d1d6789a90c54578068e4 (diff) | |
| parent | 55b431a0e8c5299997bb439add5ef8b7d2bba579 (diff) | |
merge of '16dcbcac515f688b9e5c38ab8ad41abc9a570d38'
and '3593b91506b1898a310d8990f6cbc8781d3712fd'
Diffstat (limited to 'packages/libftdi')
| -rw-r--r-- | packages/libftdi/files/doxygen-configure.patch | 14 | ||||
| -rw-r--r-- | packages/libftdi/libftdi-native_0.9.bb (renamed from packages/libftdi/libftdi-native_0.8.bb) | 0 | ||||
| -rw-r--r-- | packages/libftdi/libftdi_0.9.bb (renamed from packages/libftdi/libftdi_0.8.bb) | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/packages/libftdi/files/doxygen-configure.patch b/packages/libftdi/files/doxygen-configure.patch index 6558cbd96f..150acb67d5 100644 --- a/packages/libftdi/files/doxygen-configure.patch +++ b/packages/libftdi/files/doxygen-configure.patch @@ -1,22 +1,22 @@ -Index: libftdi-0.8/configure.in +Index: libftdi-0.9/configure.in =================================================================== ---- libftdi-0.8.orig/configure.in -+++ libftdi-0.8/configure.in +--- libftdi-0.9.orig/configure.in ++++ libftdi-0.9/configure.in @@ -32,9 +32,5 @@ else AC_MSG_RESULT(yes) fi -dnl check for doxygen --AC_PATH_PROG(DOXYGEN, doxygen, $PATH) +-AC_PATH_PROG(DOXYGEN, doxygen) -AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN); - AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config]) -AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc) +AC_OUTPUT(Makefile src/Makefile examples/Makefile libftdi.pc) -Index: libftdi-0.8/Makefile.am +Index: libftdi-0.9/Makefile.am =================================================================== ---- libftdi-0.8.orig/Makefile.am -+++ libftdi-0.8/Makefile.am +--- libftdi-0.9.orig/Makefile.am ++++ libftdi-0.9/Makefile.am @@ -2,7 +2,7 @@ # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/packages/libftdi/libftdi-native_0.8.bb b/packages/libftdi/libftdi-native_0.9.bb index 24f82778e5..24f82778e5 100644 --- a/packages/libftdi/libftdi-native_0.8.bb +++ b/packages/libftdi/libftdi-native_0.9.bb diff --git a/packages/libftdi/libftdi_0.8.bb b/packages/libftdi/libftdi_0.9.bb index 451d2e302f..f7426ceb1a 100644 --- a/packages/libftdi/libftdi_0.8.bb +++ b/packages/libftdi/libftdi_0.9.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV file://doxygen-configure.patch;patch=1" S = "${WORKDIR}/libftdi-${PV}" -inherit autotools binconfig pkgconfig lib_package +inherit autotools EXTRA_OECONF = "--disable-docs" |