aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 22:26:56 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 22:26:56 +0000
commita2e5113512e893029a6b8c52b23ab0349ca76071 (patch)
treea303c3266b1a49f104497c3b7b86b226ab99bbbd /package
parent927c01dd4a45623df173880c2b54ec8024cd8964 (diff)
downloadbuildroot-a2e5113512e893029a6b8c52b23ab0349ca76071.tar.gz
buildroot-a2e5113512e893029a6b8c52b23ab0349ca76071.tar.bz2
Use STAGING_DIR/usr/lib instead of STAGING_DIR/lib
Diffstat (limited to 'package')
-rw-r--r--package/asterisk/asterisk.mk4
-rw-r--r--package/aumix/aumix.mk2
-rw-r--r--package/avahi/avahi.mk12
-rw-r--r--package/berkeleydb/berkeleydb.mk6
-rw-r--r--package/cairo/cairo.mk4
-rw-r--r--package/curl/curl.mk2
-rw-r--r--package/dbus-glib/dbus-glib.mk2
-rw-r--r--package/dmalloc/dmalloc.mk8
-rw-r--r--package/freetype/freetype.mk4
-rw-r--r--package/gtk2-engines/gtk2-engines.mk4
-rw-r--r--package/hal/hal.mk3
-rw-r--r--package/hotplug/hotplug.mk2
-rw-r--r--package/iperf/iperf.mk2
-rw-r--r--package/libglib12/libglib12.mk4
-rw-r--r--package/libgtk12/libgtk12.mk4
-rw-r--r--package/libgtk2/libgtk2.mk6
-rw-r--r--package/liblockfile/liblockfile.mk4
-rw-r--r--package/libusb/libusb.mk2
-rw-r--r--package/mpatrol/mpatrol.mk12
-rw-r--r--package/mplayer/mplayer.mk2
-rw-r--r--package/mtd/20061007/mtd.mk2
-rw-r--r--package/pango/pango.mk4
-rw-r--r--package/python/python.mk4
-rw-r--r--package/sed/sed.mk1
-rw-r--r--package/tcpdump/tcpdump.mk6
-rw-r--r--package/tiff/tiff.mk6
-rw-r--r--package/udev/udev.mk4
-rw-r--r--package/vpnc/vpnc.mk21
-rw-r--r--package/xerces/xerces.mk3
29 files changed, 70 insertions, 70 deletions
diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
index 265234d016..986b6cd2f5 100644
--- a/package/asterisk/asterisk.mk
+++ b/package/asterisk/asterisk.mk
@@ -31,7 +31,7 @@ $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY)
$(STRIP) $(TARGET_DIR)/usr/sbin/streamplayer
$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/asterisk/modules/*.so
$(INSTALL) -m 755 $(ASTERISK_DIR)/contrib/init.d/rc.debian.asterisk $(TARGET_DIR)/etc/init.d/S60asterisk
- mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/include/
+ mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/usr/include/
rm -Rf $(TARGET_DIR)/usr/share/man
rm -f $(TARGET_DIR)/usr/sbin/safe_asterisk
rm -f $(TARGET_DIR)/usr/sbin/autosupport
@@ -43,7 +43,7 @@ asterisk: uclibc ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BIN
asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE)
asterisk-clean:
- rm -Rf $(STAGING_DIR)/include/asterisk
+ rm -Rf $(STAGING_DIR)/usr/include/asterisk
rm -Rf $(TARGET_DIR)/etc/asterisk
rm -Rf $(TARGET_DIR)/usr/lib/asterisk
rm -Rf $(TARGET_DIR)/var/lib/asterisk
diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk
index 5b5ae1a7f8..3581a8fc72 100644
--- a/package/aumix/aumix.mk
+++ b/package/aumix/aumix.mk
@@ -28,7 +28,7 @@ $(AUMIX_DIR)/.configured: $(AUMIX_DIR)/.unpacked
--prefix=/usr \
--sysconfdir=/etc \
--libdir=$(STAGING_DIR)/lib \
- --includedir=$(STAGING_DIR)/include \
+ --includedir=$(STAGING_DIR)/usr/include \
--without-gtk \
--without-gtk1 \
--without-alsa \
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 8d1179c389..f667424235 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -4,10 +4,10 @@
#
#############################################################
#
-# This program is free software; you can redistribute it
-# and/or modify it under the terms of the GNU Lesser General
-# Public License as published by the Free Software Foundation;
-# either version 2.1 of the License, or (at your option) any
+# This program is free software; you can redistribute it
+# and/or modify it under the terms of the GNU Lesser General
+# Public License as published by the Free Software Foundation;
+# either version 2.1 of the License, or (at your option) any
# later version.
AVAHI_VERSION:=0.6.19
@@ -48,7 +48,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
(cd $(AVAHI_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
- LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/include" \
+ LIBDAEMON_CFLAGS="-I$(STAGING_DIR)/usr/include" \
LIBDAEMON_LIBS="-L$(STAGING_DIR)/lib -ldaemon" \
ac_cv_func_strtod=yes \
ac_fsusage_space=yes \
@@ -116,7 +116,7 @@ $(AVAHI_DIR)/.configured: $(AVAHI_DIR)/.unpacked $(AVAHI_EXPAT_DEP)
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
$(DISABLE_NLS) \
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 8098ad6a7f..2726b785d9 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -36,7 +36,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--with-gnu-ld \
@@ -47,7 +47,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
--disable-tcl \
--disable-compat185 \
--with-pic \
- $(DISABLE_LARGEFILE) \
+ $(DISABLE_LARGEFILE) \
);
$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
touch $(DB_DIR)/.configured
@@ -70,7 +70,7 @@ $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so*
$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a
- cp -dpf $(STAGING_DIR)/include/db.h $(TARGET_DIR)/usr/include/
+ cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/
cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/
touch -c $(TARGET_DIR)/usr/lib/libdb.a
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index a4ddb28a9e..0d30638741 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -95,13 +95,13 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
--enable-static \
--with-x \
- --x-includes=$(STAGING_DIR)/include \
+ --x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--enable-ps=yes \
--enable-pdf=yes \
diff --git a/package/curl/curl.mk b/package/curl/curl.mk
index 7b292d3798..2de35fdd30 100644
--- a/package/curl/curl.mk
+++ b/package/curl/curl.mk
@@ -63,7 +63,7 @@ curl-clean:
rm -f $(TARGET_DIR)/usr/bin/curl
rm -f $(STAGING_DIR)/bin/curl*
rm -f $(STAGING_DIR)/lib/libcurl.so*
- rm -rf $(STAGING_DIR)/include/curl
+ rm -rf $(STAGING_DIR)/usr/include/curl
-$(MAKE) -C $(CURL_DIR) clean
curl-dirclean:
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 3e8cb9595d..d82a3ad791 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -30,7 +30,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked /usr/bin/pkg-config
have_abstract_sockets=yes \
DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \
DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \
- DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include" \
+ DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
DBUS_GLIB_LIBS="$(STAGING_DIR)/lib/libglib-2.0.so $(STAGING_DIR)/lib/libgobject-2.0.so $(STAGING_DIR)/lib/libgmodule-2.0.so $(STAGING_DIR)/lib/libgthread-2.0.so" \
PKG_CONFIG=/usr/bin/pkg-config \
./configure \
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index daff9f8e20..e93bf76794 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -58,7 +58,7 @@ $(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shlib \
@@ -84,14 +84,14 @@ $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY)
dmalloc: uclibc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
-dmalloc-clean:
+dmalloc-clean:
rm -f $(TARGET_DIR)/usr/lib/libdmalloc*
rm -f $(STAGING_DIR)/usr/lib/libdmalloc*
- rm -f $(STAGING_DIR)/include/dmalloc.h
+ rm -f $(STAGING_DIR)/usr/include/dmalloc.h
rm -f $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
$(MAKE) -C $(DMALLOC_DIR) clean
-dmalloc-dirclean:
+dmalloc-dirclean:
rm -rf $(DMALLOC_DIR)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index f98e4e34b6..fafd73796b 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -38,7 +38,7 @@ $(FREETYPE_DIR)/.configured: $(FREETYPE_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
);
@@ -53,7 +53,7 @@ $(STAGING_DIR)/lib/libfreetype.so: $(FREETYPE_DIR)/.compiled
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libfreetype.la
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include\',g" \
+ -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
$(STAGING_DIR)/usr/bin/freetype-config
touch -c $(STAGING_DIR)/lib/libfreetype.so
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index 61d759ea36..80ad9fd443 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -100,11 +100,11 @@ $(GTK2_ENGINES_DIR)/.configured: $(GTK2_ENGINES_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--with-x \
- --x-includes=$(STAGING_DIR)/include \
+ --x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--disable-glibtest \
--enable-explicit-deps=no \
diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index 30fc9d04ca..2d58a78d4c 100644
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -11,7 +11,7 @@ HAL_CAT:=$(ZCAT)
HAL_BINARY:=hald/hald
HAL_TARGET_BINARY:=usr/sbin/hald
-GLIB_CFLAGS:=-I$(STAGING_DIR)/include/glib-2.0 \
+GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \
-I$(STAGING_DIR)/lib/glib/include
GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \
$(STAGING_DIR)/lib/libgmodule-2.0.so \
@@ -69,6 +69,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
rm -rf $(TARGET_DIR)/usr/share/gtk-doc
rm -rf $(TARGET_DIR)/usr/share/hal/device-manager
rm -rf $(TARGET_DIR)/usr/lib/pkgconfig
+ # remove _everything_ in $(TARGET_DIR)/usr/include?
rm -rf $(TARGET_DIR)/usr/include
rm -rf $(TARGET_DIR)/usr/lib/libhal*.so
rm -rf $(TARGET_DIR)/usr/lib/libhal*.la
diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk
index 15b7a54298..5405100566 100644
--- a/package/hotplug/hotplug.mk
+++ b/package/hotplug/hotplug.mk
@@ -15,7 +15,7 @@ $(HOTPLUG_DIR): $(HOTPLUG_SOURCE)
$(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR)
$(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \
- KERNEL_INCLUDE_DIR=$(STAGING_DIR)/include \
+ KERNEL_INCLUDE_DIR=$(STAGING_DIR)/usr/include \
TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR);
$(STRIP) $(HOTPLUG_DIR)/hotplug;
touch -c $(HOTPLUG_DIR)/hotplug
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index ef5ec5942e..f5aeeb3670 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -42,7 +42,7 @@ $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- --includedir=$(STAGING_DIR)/include \
+ --includedir=$(STAGING_DIR)/usr/include \
);
touch $(IPERF_DIR)/.configured
diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk
index 4cd2fc1dd9..c5dd62bf12 100644
--- a/package/libglib12/libglib12.mk
+++ b/package/libglib12/libglib12.mk
@@ -38,7 +38,7 @@ $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
@@ -60,7 +60,7 @@ $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINAR
sharedstatedir=$(STAGING_DIR)/com \
localstatedir=$(STAGING_DIR)/var \
libdir=$(STAGING_DIR)/lib \
- includedir=$(STAGING_DIR)/include \
+ includedir=$(STAGING_DIR)/usr/include \
oldincludedir=$(STAGING_DIR)/include \
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk
index 6e9c14d099..a52ee01a18 100644
--- a/package/libgtk12/libgtk12.mk
+++ b/package/libgtk12/libgtk12.mk
@@ -40,7 +40,7 @@ $(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
$(DISABLE_NLS) \
@@ -68,7 +68,7 @@ $(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINA
sharedstatedir=$(STAGING_DIR)/com \
localstatedir=$(STAGING_DIR)/var \
libdir=$(STAGING_DIR)/lib \
- includedir=$(STAGING_DIR)/include \
+ includedir=$(STAGING_DIR)/usr/include \
oldincludedir=$(STAGING_DIR)/include \
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index d2411c65f7..9379662822 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -88,7 +88,7 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
# The following is an truely evil hack!
# I dont yet understand why configure is not doing this right
# TODO: also remove 'odd-include-problem.patch' when this is fixed
- $(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/include/pango-1.0 -I$(STAGING_DIR)/include/cairo\',g" $(LIBGTK2_DIR)/configure
+ $(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/pango-1.0 -I$(STAGING_DIR)/usr/include/cairo\',g" $(LIBGTK2_DIR)/configure
$(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L$(STAGING_DIR)/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
(cd $(LIBGTK2_DIR); rm -rf config.cache; \
$(LIBGTK2_BUILD_ENV) \
@@ -105,13 +105,13 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
--enable-static \
--with-x \
- --x-includes=$(STAGING_DIR)/include \
+ --x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--disable-glibtest \
--enable-explicit-deps=no \
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 5bcfe79f20..490927cffd 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -48,8 +48,8 @@ liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
liblockfile-clean:
rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
rm -f $(STAGING_DIR)/lib/liblockfile*
- rm -f $(STAGING_DIR)/include/lockfile.h
- rm -f $(STAGING_DIR)/include/mailfile.h
+ rm -f $(STAGING_DIR)/usr/include/lockfile.h
+ rm -f $(STAGING_DIR)/usr/include/mailfile.h
rm -rf $(STAGING_DIR)/man
$(MAKE) -C $(LIBLOCKFILE_DIR) clean
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index fee780261e..e4bd31f093 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -48,7 +48,7 @@ libusb: uclibc $(TARGET_DIR)/$(LIBUSB_BINARY)
libusb-clean:
rm -f $(STAGING_DIR)/bin/libusb-config
- rm -f $(STAGING_DIR)/includes/usb*.h
+ rm -f $(STAGING_DIR)/usr/includes/usb*.h
rm -f $(STAGING_DIR)/lib/libusb*
rm -rf $(STAGING_DIR)/lib/pkgconfig
rm -f $(TARGET_DIR)/usr/lib/libusb*
diff --git a/package/mpatrol/mpatrol.mk b/package/mpatrol/mpatrol.mk
index aa3f9ca7f7..4490cb7699 100644
--- a/package/mpatrol/mpatrol.mk
+++ b/package/mpatrol/mpatrol.mk
@@ -62,22 +62,22 @@ $(TARGET_DIR)/$(MPATROL_TARGET_BINARY): $(MPATROL_BUILD_DIR)/$(MPATROL_BINARY)
ln -sf libpthread.so.0 $(TARGET_DIR)/lib/libpthread.so; fi
(cd $(MPATROL_DIR); \
cp -dpf bin/mp* bin/hexwords $(TARGET_DIR)/usr/bin; \
- cp -dpf src/mp*.h $(STAGING_DIR)/include; \
- mkdir -p $(STAGING_DIR)/include/mpatrol; \
- cp -dpf tools/*.h $(STAGING_DIR)/include/mpatrol)
+ cp -dpf src/mp*.h $(STAGING_DIR)/usr/include; \
+ mkdir -p $(STAGING_DIR)/usr/include/mpatrol; \
+ cp -dpf tools/*.h $(STAGING_DIR)/usr/include/mpatrol)
touch $(TARGET_DIR)/$(MPATROL_TARGET_BINARY)
mpatrol: uclibc $(MPATROL_SYMBOL_DEPS) $(TARGET_DIR)/$(MPATROL_TARGET_BINARY)
-mpatrol-clean:
+mpatrol-clean:
(cd $(TARGET_DIR)/usr/lib; rm -f libmpatrol* libmpalloc*)
(cd $(TARGET_DIR)/usr/bin; \
rm -f mpatrol mprof mptrace mleak mpsym mpedit hexwords)
- (cd $(STAGING_DIR)/include; \
+ (cd $(STAGING_DIR)/usr/include; \
rm -rf mpatrol.h mpalloc.h mpdebug.h mpatrol)
$(MAKE) -C $(MPATROL_DIR)/build/unix clobber
-mpatrol-dirclean:
+mpatrol-dirclean:
rm -rf $(MPATROL_DIR)
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 3634600a6d..ee9dd0d04a 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -38,7 +38,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
--host-cc=$(HOSTCC) \
--cc=$(TARGET_CC) \
--as=$(TARGET_CROSS)as \
- --with-extraincdir=$(STAGING_DIR)/include \
+ --with-extraincdir=$(STAGING_DIR)/usr/include \
--with-extralibdir=$(STAGING_DIR)/lib \
--enable-mad \
--enable-fbdev \
diff --git a/package/mtd/20061007/mtd.mk b/package/mtd/20061007/mtd.mk
index 006bfeb9c8..a043fdcba7 100644
--- a/package/mtd/20061007/mtd.mk
+++ b/package/mtd/20061007/mtd.mk
@@ -84,7 +84,7 @@ MTD_BUILD_TARGETS := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y))
$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
mkdir -p $(TARGET_DIR)/usr/sbin
- $(MAKE) CFLAGS="-I. -I./include -I$(LINUX_HEADERS_DIR)/include -I$(STAGING_DIR)/include $(TARGET_CFLAGS)" \
+ $(MAKE) CFLAGS="-I. -I./include -I$(LINUX_HEADERS_DIR)/include -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
CROSS= CC=$(TARGET_CC) LINUXDIR=$(LINUX_DIR) WITHOUT_XATTR=1 -C $(MTD_DIR)
MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index f71add7986..f65a6f71e6 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -100,13 +100,13 @@ $(PANGO_DIR)/.configured: $(PANGO_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
--enable-static \
--with-x \
- --x-includes=$(STAGING_DIR)/include \
+ --x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--disable-glibtest \
--enable-explicit-deps=no \
diff --git a/package/python/python.mk b/package/python/python.mk
index e831aa0f2d..3318c3b078 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -61,7 +61,7 @@ $(PYTHON_DIR)/.configured: $(PYTHON_DIR)/.hostpython
$(PYTHON_DIR)/$(PYTHON_BINARY): $(PYTHON_DIR)/.configured
export PYTHON_DISABLE_SSL=1
$(MAKE) CC=$(TARGET_CC) -C $(PYTHON_DIR) DESTDIR=$(TARGET_DIR) \
- PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
+ PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
PYTHON_DISABLE_MODULES="$(BR2_PYTHON_DISABLED_MODULES)" \
HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen
@@ -71,7 +71,7 @@ $(TARGET_DIR)/$(PYTHON_TARGET_BINARY): $(PYTHON_DIR)/$(PYTHON_BINARY)
LD_LIBRARY_PATH=$(STAGING_DIR)/lib
$(MAKE) CC=$(TARGET_CC) -C $(PYTHON_DIR) install \
DESTDIR=$(TARGET_DIR) CROSS_COMPILE=yes \
- PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/include \
+ PYTHON_MODULES_INCLUDE=$(STAGING_DIR)/usr/include \
PYTHON_MODULES_LIB=$(STAGING_DIR)/lib \
PYTHON_DISABLE_MODULES="$(BR2_PYTHON_DISABLED_MODULES)" \
HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen && \
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index c3ccf4c49f..ef3e0b49d4 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -116,7 +116,6 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- --include=$(STAGING_DIR)/include \
--include=$(STAGING_DIR)/usr/include \
$(DISABLE_NLS) \
);
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index fb4b523276..969ae6aabf 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -1,6 +1,6 @@
#############################################################
#
-# tcpdump
+# tcpdump
#
#############################################################
# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
@@ -42,7 +42,7 @@ $(TCPDUMP_DIR)/.configured: $(TCPDUMP_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--with-build-cc="$(HOSTCC)" \
@@ -56,7 +56,7 @@ $(TCPDUMP_DIR)/tcpdump: $(TCPDUMP_DIR)/.configured
$(MAKE) CC="$(TARGET_CC)" \
LDFLAGS="-L$(STAGING_DIR)/lib" \
LIBS="-lpcap" \
- INCLS="-I. -I$(STAGING_DIR)/include" \
+ INCLS="-I. -I$(STAGING_DIR)/usr/include" \
-C $(TCPDUMP_DIR)
$(TARGET_DIR)/sbin/tcpdump: $(TCPDUMP_DIR)/tcpdump
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 92481b8b0b..d84c241f2b 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -40,16 +40,16 @@ $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
--enable-static \
--disable-cxx \
--without-x \
- --with-jpeg-include-dir=$(STAGING_DIR)/include \
+ --with-jpeg-include-dir=$(STAGING_DIR)/usr/include \
--with-jpeg-lib-dir=$(STAGING_DIR)/lib \
- --with-zlib-include-dir=$(STAGING_DIR)/include \
+ --with-zlib-include-dir=$(STAGING_DIR)/usr/include \
--with-zlib-lib-dir=$(STAGING_DIR)/lib \
);
touch $(TIFF_DIR)/.configured
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 1e9f87d48f..0143390928 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -63,7 +63,7 @@ $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0:
$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \
USE_LOG=false USE_SELINUX=false \
udevdir=$(UDEV_ROOT) EXTRAS="extras/volume_id" -C $(UDEV_DIR)
- $(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/include/libvolume_id.h
+ $(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
-ln -sf libvolume_id.so.0.72.0 $(STAGING_DIR)/usr/lib/libvolume_id.so.0
-ln -sf libvolume_id.so.0 $(STAGING_DIR)/usr/lib/libvolume_id.so
@@ -77,7 +77,7 @@ $(TARGET_DIR)/lib/udev/vol_id: $(STAGING_DIR)/usr/lib/libvolume_id.so.0.72.0
udev-volume_id: udev $(TARGET_DIR)/lib/udev/vol_id
udev-volume_id-clean:
- rm -f $(STAGING_DIR)/include/libvolume_id.h
+ rm -f $(STAGING_DIR)/usr/include/libvolume_id.h
rm -f $(STAGING_DIR)/usr/lib/libvolume_id.so*
rm -f $(TARGET_DIR)/usr/lib/libvolume_id.so.0*
rm -f $(TARGET_DIR)/lib/udev/vol_id
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index 8c9c96e6be..7971dbbb6a 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -27,17 +27,18 @@ $(VPNC_DIR)/.configured: $(VPNC_DIR)/.unpacked
$(VPNC_BINARY): $(VPNC_DIR)/.configured
rm -f $@
- $(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/include CC=$(TARGET_CC) -C $(VPNC_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) INCLUDE=$(STAGING_DIR)/usr/include \
+ CC=$(TARGET_CC) -C $(VPNC_DIR)
$(VPNC_TARGET_BINARY): $(VPNC_BINARY)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- DESTDIR=$(TARGET_DIR) \
- BINDIR=/usr/local/bin \
- SBINDIR=/usr/local/sbin \
- ETCDIR=/etc/vpnc \
- MANDIR=/usr/local/share/man \
- VERSION=$(VPNC_VERSION) \
- INCLUDE=$(STAGING_DIR)/include \
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+ DESTDIR=$(TARGET_DIR) \
+ BINDIR=/usr/local/bin \
+ SBINDIR=/usr/local/sbin \
+ ETCDIR=/etc/vpnc \
+ MANDIR=/usr/local/share/man \
+ VERSION=$(VPNC_VERSION) \
+ INCLUDE=$(STAGING_DIR)/usr/include \
LDFLAGS="-g -lgcrypt -lgpg-error" \
-C $(VPNC_DIR) install
$(STRIP) --strip-unneeded $(VPNC_TARGET_BINARY)
@@ -46,7 +47,7 @@ $(VPNC_TARGET_BINARY): $(VPNC_BINARY)
-vpnc: uclibc $(VPNC_TARGET_BINARY)
+vpnc: uclibc $(VPNC_TARGET_BINARY)
vpnc-source: $(DL_DIR)/$(VPNC_SOURCE)
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 179402a866..a33e4bc9e5 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -22,7 +22,6 @@ $(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE)
$(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
(cd $(XERCES_DIR)/src/xercesc; rm -rf config.cache; \
- $(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
XERCESCROOT=$(XERCES_DIR) \
./runConfigure -plinux -minmem \
@@ -47,7 +46,7 @@ $(TARGET_DIR)/usr/$(XERCES_BINARY): $(STAGING_DIR)/$(XERCES_BINARY)
xerces: uclibc $(TARGET_DIR)/usr/$(XERCES_BINARY)
xerces-clean:
- rm -rf $(STAGING_DIR)/include/xercesc
+ rm -rf $(STAGING_DIR)/usr/include/xercesc
rm -f $(STAGING_DIR)/lib/libxerces*
rm -f $(TARGET_DIR)/usr/lib/libxerces*
-$(MAKE) -C $(XERCES_DIR) clean