diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-12-18 04:09:40 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-12-18 04:09:40 +0000 |
| commit | ae4519c48556e939d0867dcef7751a06e15dd513 (patch) | |
| tree | ed2bedd87117eef0d48e3b370336f00ea639a09a | |
| parent | 103e341e7a8b0cfcea75370ec5e761ef3f97af92 (diff) | |
| download | anaconda-ae4519c48556e939d0867dcef7751a06e15dd513.tar.gz anaconda-ae4519c48556e939d0867dcef7751a06e15dd513.tar.xz anaconda-ae4519c48556e939d0867dcef7751a06e15dd513.zip | |
always enter stubs dir. but don't build libbz2 stub on ia64 still
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | stubs/Makefile | 12 |
2 files changed, 11 insertions, 9 deletions
@@ -1,13 +1,9 @@ # Copyright (C) 1998-2002 Red Hat, Inc. include Makefile.inc -ifneq (ia64, $(ARCH)) -STUBS=stubs -endif - -SUBDIRSHD = isys loader2 po \ +SUBDIRSHD = isys loader2 po stubs \ textw utils scripts bootdisk installclasses \ - fonts iw pixmaps $(STUBS) isomd5sum command-stubs + fonts iw pixmaps isomd5sum command-stubs SUBDIRS = $(SUBDIRSHD) # DESTDIR - destination for install image for install purposes diff --git a/stubs/Makefile b/stubs/Makefile index 3aac5f14e..59a69da25 100644 --- a/stubs/Makefile +++ b/stubs/Makefile @@ -3,7 +3,13 @@ include ../Makefile.inc LIBBZ = libbz2.so.1 LIBUTF8 = libunicode-lite.so.1 -all: $(LIBBZ) $(LIBUTF8) +TARGETS= $(LIBUTF8) + +ifneq (ia64, $(ARCH)) +TARGETS += $(LIBBZ) +endif + +all: $(TARGETS) $(LIBBZ): bzip.c gcc -fPIC -shared -o $@ $< @@ -15,7 +21,7 @@ clean: rm -f *.so.* *.o install: - install $(LIBBZ) $(DESTDIR)/$(RUNTIMEDIR) - install $(LIBUTF8) $(DESTDIR)/$(RUNTIMEDIR) + mkdir -p $(DESTDIR)/$(RUNTIMEDIR) + for lib in $(TARGETS) ; do install $$lib $(DESTDIR)/$(RUNTIMEDIR) ; done depend: |