3 files changed, 34 insertions, 23 deletions
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index a90c7c22b..e69de29bb 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_UCLIBC
-	prompt "uClibc............................... embedded C library"
-	bool
-	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	depends on ADK_TARGET_LIB_UCLIBC
-	help
-	  Embedded C library.
-
-config ADK_PACKAGE_UCLIBC_DEV
-	prompt "uclibc-dev........................... development files"
-	bool
-	default n
-	depends on ADK_TARGET_LIB_UCLIBC
-	help
-	  C library header files.
-
-
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
new file mode 100644
index 000000000..bfc1b08c5
--- /dev/null
+++ b/package/uclibc/Config.in.manual
@@ -0,0 +1,17 @@
+config ADK_PACKAGE_UCLIBC
+	prompt "uClibc............................ embedded C library"
+	bool
+	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
+	default n
+	depends on ADK_TARGET_LIB_UCLIBC
+	help
+	  Embedded C library.
+
+config ADK_PACKAGE_UCLIBC_DEV
+	prompt "uClibc-dev........................ development files"
+	tristate
+	default n
+	depends on ADK_TARGET_LIB_UCLIBC && ADK_PACKAGE_UCLIBC
+	help
+	  C library header files.
+
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index c89e20fe6..787dc4e56 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -14,8 +14,16 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+=	uclibc-dev-install
+
 # do nothing, uClibc is already build in toolchain directory
-do-install:
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc
 	# create timezone file
 	echo 'CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00' > $(IDIR_UCLIBC)/etc/TZ
@@ -28,18 +36,22 @@ do-install:
 		$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \
 		$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/; \
 	done
+
+uclibc-dev-install:
+	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
+	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
 	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
 		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/${PKG_NAME}-${PKG_VERSION} \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
 		PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		HOSTCC="$(HOSTCC)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_headers
-	@find $(IDIR_UCLIBC_DEV) -name .install -delete
-	@find $(IDIR_UCLIBC_DEV) -name ..install.cmd -delete
+	@find $(IDIR_UCLIBC_DEV) -name .install -exec rm {} \;
+	@find $(IDIR_UCLIBC_DEV) -name ..install.cmd -exec rm {} \;
 
 include ${TOPDIR}/mk/pkg-bottom.mk