diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-01-01 21:57:28 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-01-01 21:57:28 +0000 |
| commit | 4643b181bdf1d9121f9d6d4214e991e7b9f52d30 (patch) | |
| tree | c5615b9d242314847c555255c4e57f195c3444ad /ldso | |
| parent | 01d1ae3769f7fb1fa66dbc0789a61b05fee3452f (diff) | |
Change all 'cd <foo>; bar' constructs to 'cd <foo> && bar' for
proper error checking
-Erik
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/ldso/Makefile | 4 | ||||
| -rw-r--r-- | ldso/libdl/Makefile | 4 | ||||
| -rw-r--r-- | ldso/util/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index a61998b10..d85900fbb 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -32,7 +32,7 @@ TARGET_CFLAGS += #-DDL_DEBUG #-funroll-loops LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so TARGET_CFLAGS+=-fPIC -D__PIC__ -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ - -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" + -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" CSRC= boot1.c hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c COBJS=$(patsubst %.c,%.o, $(CSRC)) ASRC=$(shell ls $(TARGET_ARCH)/*.S) @@ -47,7 +47,7 @@ lib:: ld.so.h $(OBJS) $(DLINK_OBJS) -Wl,-soname,$(UCLIBC_LDSO) $(OBJS) install -d $(TOPDIR)lib install -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib - (cd $(TOPDIR)lib;ln -sf $(LDSO_FULLNAME) $(UCLIBC_LDSO)) + (cd $(TOPDIR)lib && ln -sf $(LDSO_FULLNAME) $(UCLIBC_LDSO)) ld.so.h: Makefile echo "#define _dl_static_progname \""$(UCLIBC_LDSO)"\"" > ld.so.h diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index 3187ee340..faaced6c0 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -55,8 +55,8 @@ shared: all install -d $(TOPDIR)lib rm -f $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION) install -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib; - (cd $(TOPDIR)lib; ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED)); - (cd $(TOPDIR)lib; ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED).$(MAJOR_VERSION)); + (cd $(TOPDIR)lib && ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED)); + (cd $(TOPDIR)lib && ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED).$(MAJOR_VERSION)); clean: $(RM) -f .depend $(LIBDL_SHARED)* $(LIBDL_SHARED_FULLNAME) core *.o *.a *.s *.i tmp_make foo *~ diff --git a/ldso/util/Makefile b/ldso/util/Makefile index 6e3d5530b..99d0bf04b 100644 --- a/ldso/util/Makefile +++ b/ldso/util/Makefile @@ -50,7 +50,7 @@ endif ldd: ldd.c $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ - -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" \ + -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \ -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \ -static ldd.c -o $@ $(STRIPTOOL) -x -R .note -R .comment $@ |