diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-12-12 13:16:31 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-12-12 13:16:31 +0000 |
| commit | 51dd2d4a8b3c695f9261d79a4d7e7586c1857a2f (patch) | |
| tree | 1c47cb52e0151f7c71d033378b5965b974aca5f6 /package/libcgi/libcgi.mk | |
| parent | 5eeac710ca151c7e714350839be491f564ba4488 (diff) | |
* Remove bogus tab in libcgi.mk that prevented the library from being build
* Added headerfiles to STAGING_DIR in usr/include/libcgi so that we
can actually use the library with the toolchain
* Added patch that fixes up the makefile.in and fixes a few bugs in libcgi
* rm the target-dir's so* in libcgi-clean
Most of the patch has been taken from the debian package.
Thanks to Lars Munch.
Diffstat (limited to 'package/libcgi/libcgi.mk')
| -rw-r--r-- | package/libcgi/libcgi.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index c72563b16..141100889 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -15,6 +15,7 @@ $(DL_DIR)/$(LIBCGI_SOURCE): $(LIBCGI_DIR)/.source: $(DL_DIR)/$(LIBCGI_SOURCE) $(ZCAT) $(DL_DIR)/$(LIBCGI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LIBCGI_DIR) package/libcgi/ libcgi\*.patch touch $(LIBCGI_DIR)/.source $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source @@ -25,7 +26,7 @@ $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ + --prefix=$(STAGING_DIR) \ --sysconfdir=/etc \ ); touch $(LIBCGI_DIR)/.configured; @@ -33,16 +34,19 @@ $(LIBCGI_DIR)/.configured: $(LIBCGI_DIR)/.source $(LIBCGI_DIR)/$(LIBCGI_LIBRARY): $(LIBCGI_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(LIBCGI_DIR) -$(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY): $(LIBCGI_DIR)/$(LIBCGI_LIBRARY) - cp $(LIBCGI_DIR)/src/libcgi.so $(TARGET_DIR)/usr/lib/ +$(STAGING_DIR)/lib/libcgi.so: $(LIBCGI_DIR)/$(LIBCGI_LIBRARY) + $(MAKE) -C $(LIBCGI_DIR) install + touch -c $(STAGING_DIR)/lib/libcgi.so + +$(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY): $(STAGING_DIR)/lib/libcgi.so + cp -dpf $(STAGING_DIR)/lib/libcgi.so* $(TARGET_DIR)/usr/lib/ libcgi: uclibc $(TARGET_DIR)/$(LIBCGI_TARGET_LIBRARY) libcgi-source: $(DL_DIR)/$(LIBCGI_SOURCE) libcgi-clean: - rm $(TARGET_DIR)/usr/lib/libcgi.so - + rm $(TARGET_DIR)/usr/lib/libcgi.so* -$(MAKE) -C $(LIBCGI_DIR) clean libcgi-dirclean: @@ -54,6 +58,6 @@ libcgi-dirclean: # ############################################################# ifeq ($(strip $(BR2_PACKAGE_LIBCGI)),y) - TARGETS+=libcgi +TARGETS+=libcgi endif |