diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2001-06-02 01:45:55 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2001-06-02 01:45:55 +0000 |
| commit | 47c1983b76408513ce082457fdccfb107ad93901 (patch) | |
| tree | 7dadf2b9d188995c2bf962089d8b232232a7fb05 /Makefile | |
| parent | 0bee90dec074aad6dc6f42c71b0b78986fdb03ab (diff) | |
Fix misuse of DO_SHARED and LDSO_PRESENT. Add -f option to "cp"s.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -30,7 +30,7 @@ TOPDIR=./ include Rules.mak -ifeq ($(DO_SHARED),shared) +ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) LDSO_DIR = ldso endif DIRS = extra $(LDSO_DIR) libc libcrypt libresolv libutil libm @@ -154,15 +154,15 @@ install_target: ifeq ($(DO_SHARED),shared) install -d $(TARGET_PREFIX)$(ROOT_DIR)/lib cp -fa lib/*.so* $(TARGET_PREFIX)$(ROOT_DIR)/lib; +endif ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) install -d $(TARGET_PREFIX)$(ROOT_DIR)/etc install -d $(TARGET_PREFIX)$(ROOT_DIR)/sbin install -d $(TARGET_PREFIX)$(ROOT_DIR)/usr/bin - cp ldso/util/ldd $(TARGET_PREFIX)$(ROOT_DIR)/usr/bin - cp ldso/util/ldconfig $(TARGET_PREFIX)$(ROOT_DIR)/sbin + cp -f ldso/util/ldd $(TARGET_PREFIX)$(ROOT_DIR)/usr/bin + cp -f ldso/util/ldconfig $(TARGET_PREFIX)$(ROOT_DIR)/sbin # -@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi endif -endif # Installs development library and headers # This is done with the assumption that it can blow away anything @@ -179,8 +179,8 @@ ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) install -d $(DEVEL_PREFIX)$(ROOT_DIR)/etc install -d $(DEVEL_PREFIX)$(ROOT_DIR)/sbin install -d $(DEVEL_PREFIX)$(ROOT_DIR)/usr/bin - cp ldso/util/ldd $(DEVEL_PREFIX)$(ROOT_DIR)/usr/bin - cp ldso/util/ldconfig $(DEVEL_PREFIX)$(ROOT_DIR)/sbin + cp -f ldso/util/ldd $(DEVEL_PREFIX)$(ROOT_DIR)/usr/bin + cp -f ldso/util/ldconfig $(DEVEL_PREFIX)$(ROOT_DIR)/sbin # -@if [ -x ldso/util/ldconfig ] ; then ldso/util/ldconfig; fi endif install -d $(DEVEL_PREFIX)$(ROOT_DIR)/etc @@ -201,7 +201,7 @@ clean: @rm -rf tmp lib - find include -type l -exec rm -f {} \; - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core \) -exec rm -f {} \; -ifeq ($(DO_SHARED),shared) +ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) make -C ldso clean endif |