Fix typo in configure, remove spurious install of headers

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8916 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-01-29 22:27:10 +00:00
parent c9212db1d6
commit 49e577f027
5 changed files with 219 additions and 262 deletions

View file

@ -1,3 +1,13 @@
2001-01-29 Adam Fedor <fedor@gnu.org>
* configure.in: Remove check for alternate libobjc and Headers
include. Fix typo in setting cppflags_temp in GMP test.
* Source/Makefile.preamble (ADDITIONAL_INSTALL_DIRS): Don't
make .../gnustep/Foundation
* Source/Makefile.postamble (after-install): Don't install headers
in .../gnustep/Foundation
Mon Jan 29 13:08:21 2001 Nicola Pero <nicola@brainstorm.co.uk>
* GNUmakefile: Include local base.make.

View file

@ -49,10 +49,6 @@ before-all:: $(GENERATED_HFILES)
# Unfortunately the way the header files are placed in relationship
# to the source we must install the GNU header manually
after-install::
for file in $(BASE_HEADERS); do \
$(INSTALL_DATA) ../Headers/gnustep/base/$$file \
$(GNUSTEP_HEADERS)/gnustep/Foundation/$$file ; \
done
for file in $(GNU_HEADERS); do \
$(INSTALL_DATA) ../Headers/gnustep/base/$$file \
$(GNUSTEP_HEADERS)/gnustep/base/$$file ; \

View file

@ -71,7 +71,6 @@ endif
# Additional directories to be created during installation
ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/base \
$(GNUSTEP_HEADERS)/gnustep/Foundation \
$(GNUSTEP_HEADERS)/gnustep/unicode \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)

442
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -193,28 +193,6 @@ else
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
fi
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
# If so, there are probably other libraries that we want there also, so
# leave the proper includes in CPPFLAGS and LDFLAGS
AC_MSG_CHECKING(for alternate objc library)
AC_CACHE_VAL(gs_cv_objc_libdir,
[dnl
gs_cv_objc_libdir=NONE
if test -f $GNUSTEP_HDIR/objc/objc.h; then
if test -f $GNUSTEP_LDIR/libobjc.a -o -f $GNUSTEP_LDIR/libobjc.so; then
gs_cv_objc_libdir=$GNUSTEP_LDIR
else
gs_cv_objc_libdir=NONE
fi
fi
])
AC_MSG_RESULT($gs_cv_objc_libdir)
if test "$gs_cv_objc_libdir" != "NONE"; then
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR"
fi
#--------------------------------------------------------------------
# Check if Objective-C is installed
#--------------------------------------------------------------------
@ -863,7 +841,7 @@ AC_ARG_WITH(gmp-library,
[ --with-gmp-library=PATH library path for gmp libraries],
gmp_libdir="$withval", gmp_libdir="no")
cppflags_temp=$CFLAGS
cppflags_temp=$CPPFLAGS
libs_temp=$LIBS
if test "$gmp_incdir" != "no"; then