mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 16:50:58 +00:00
(HEADERS_INSTALL): Remove objects/config.h.
(install): Look for libobjects.so file, not just for configure variable. Remove unwanted `;'. Install objects/config.h from build directory. (Fixes provided by Matthias Klose <doko@cs.tu-berlin.de>). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@731 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
a7f0a4e618
commit
70dce47779
1 changed files with 4 additions and 3 deletions
|
@ -386,7 +386,7 @@ Foundation/NSValue.h \
|
||||||
Foundation/NSZone.h \
|
Foundation/NSZone.h \
|
||||||
Foundation/objc-load.h
|
Foundation/objc-load.h
|
||||||
|
|
||||||
HEADERS_INSTALL = @HEADERS_INSTALL@ objects/config.h objects/stdobjects.h
|
HEADERS_INSTALL = @HEADERS_INSTALL@ objects/stdobjects.h
|
||||||
OBJS_INSTALL = @OBJS_INSTALL@
|
OBJS_INSTALL = @OBJS_INSTALL@
|
||||||
OBJS_INSTALL_PIC = $(OBJS_INSTALL:.o=_pic.o)
|
OBJS_INSTALL_PIC = $(OBJS_INSTALL:.o=_pic.o)
|
||||||
|
|
||||||
|
@ -440,16 +440,17 @@ install: installdirs all
|
||||||
# Install the library
|
# Install the library
|
||||||
$(INSTALL_DATA) libobjects.a $(libdir)
|
$(INSTALL_DATA) libobjects.a $(libdir)
|
||||||
$(RANLIB) $(libdir)/libobjects.a; \
|
$(RANLIB) $(libdir)/libobjects.a; \
|
||||||
if [ @LIBOBJECTS_SO@ ]; then \
|
if [ -n "@LIBOBJECTS_SO@" ]; then \
|
||||||
$(INSTALL_DATA) libobjects.so.$(OBJECTS_VERSION) $(libdir) ; \
|
$(INSTALL_DATA) libobjects.so.$(OBJECTS_VERSION) $(libdir) ; \
|
||||||
rm -f $(libdir)/libobjects.so.$(OBJECTS_MAJOR_VERSION) ; \
|
rm -f $(libdir)/libobjects.so.$(OBJECTS_MAJOR_VERSION) ; \
|
||||||
ln -s $(libdir)/libobjects.so.$(OBJECTS_VERSION) ; \
|
ln -s $(libdir)/libobjects.so.$(OBJECTS_VERSION) \
|
||||||
$(libdir)/libobjects.so.$(OBJECTS_MAJOR_VERSION) ; \
|
$(libdir)/libobjects.so.$(OBJECTS_MAJOR_VERSION) ; \
|
||||||
fi
|
fi
|
||||||
# Install the headers
|
# Install the headers
|
||||||
for file in $(HEADERS_INSTALL); do \
|
for file in $(HEADERS_INSTALL); do \
|
||||||
$(INSTALL_DATA) $(srcdir)/$$file $(includedir)/$$file ; \
|
$(INSTALL_DATA) $(srcdir)/$$file $(includedir)/$$file ; \
|
||||||
done
|
done
|
||||||
|
$(INSTALL_DATA) objects/config.h $(includedir)/objects/config.h
|
||||||
cd $(includedir)/Foundation; rm -f README; ln -s ../objects/README .
|
cd $(includedir)/Foundation; rm -f README; ln -s ../objects/README .
|
||||||
cd $(includedir)/objc; rm -f README; ln -s ../objects/README .
|
cd $(includedir)/objc; rm -f README; ln -s ../objects/README .
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue