diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-10-18 11:51:50 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-10-18 11:51:50 +0000 |
| commit | 83b95bdb42e4fd1e183dbf30aa3b5a6f6c26f392 (patch) | |
| tree | d4b0462e1d811e20faeef0e2657af26bdc2ea817 /make | |
| parent | 02bf5816b5dfab63ddabe0bc56286aac09e3cf0c (diff) | |
Cope with the new RUNTIME_PREFIX
Diffstat (limited to 'make')
| -rw-r--r-- | make/uclibc.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/make/uclibc.mk b/make/uclibc.mk index ad41b4907..310a5ec98 100644 --- a/make/uclibc.mk +++ b/make/uclibc.mk @@ -33,7 +33,9 @@ else endif perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \ $(UCLIBC_DIR)/.config - perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \ + perl -i -p -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"$(STAGING_DIR)\",g' \ + $(UCLIBC_DIR)/.config + perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"$(STAGING_DIR)/usr\",g' \ $(UCLIBC_DIR)/.config perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \ $(UCLIBC_DIR)/.config @@ -61,7 +63,9 @@ $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a ifneq ($(TARGET_DIR),) $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a - $(MAKE) -C $(UCLIBC_DIR) DEVEL_PREFIX=$(TARGET_DIR) \ + $(MAKE) -C $(UCLIBC_DIR) \ + RUNTIME_PREFIX=$(TARGET_DIR) \ + DEVEL_PREFIX=$(TARGET_DIR)/usr \ SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_runtime @@ -94,11 +98,11 @@ uclibc-dirclean: ############################################################# $(TARGET_DIR)/usr/lib/libc.a: $(STAGING_DIR)/lib/libc.a - $(MAKE) DEVEL_PREFIX=$(TARGET_DIR)/usr SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ - DEVEL_TOOL_PREFIX=$(TARGET_DIR) -C $(UCLIBC_DIR) \ - install_dev - #remove the extra copy of the shared libs - rm -f $(TARGET_DIR)/usr/lib/*-*.so + $(MAKE) -C $(UCLIBC_DIR) \ + RUNTIME_PREFIX=$(TARGET_DIR) \ + DEVEL_PREFIX=$(TARGET_DIR)/usr \ + SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \ + DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_dev (cd $(TARGET_DIR)/usr/lib; \ ln -fs /lib/libc.so.0 libc.so; \ ln -fs /lib/libdl.so.0 libdl.so; \ |