Force a 'flatinstall' installation under windows

This commit is contained in:
jjgarcia 2004-06-19 10:26:31 +00:00
parent c625ef8bfb
commit 10a532418e
3 changed files with 12 additions and 4 deletions

View file

@ -73,8 +73,10 @@ Makefile: Makefile.in build/config.status
# ==================== Installation ====================
INSTALL_TARGET = @INSTALL_TARGET@
install: build/Makefile
cd build; $(MAKE) install
cd build; $(MAKE) $(INSTALL_TARGET)
uninstall:
cd build; $(MAKE) uninstall
@ -122,8 +124,8 @@ TAGS tags:
(cd ${srcdir}/src; \
etags c/*.[cd] h/*.h)
check:
@echo "We don't have any tests for ECL yet."
check test:
cd build; $(MAKE) test
TAR_DIR=ecl-$(VERSION)

3
src/aclocal.m4 vendored
View file

@ -130,6 +130,7 @@ AC_SUBST(SHAREDPREFIX)
AC_SUBST(OBJEXT)dnl These are set by autoconf
AC_SUBST(EXEEXT)
AC_SUBST(LDINSTALLNAME)dnl Link-flag that tells where the library will reside.
AC_SUBST(INSTALL_TARGET)dnl Which type of installation: flat directory or unix like.
LDRPATH='~*'
SHAREDEXT='so'
SHAREDPREFIX='lib'
@ -139,6 +140,7 @@ PICFLAG='-fPIC'
LDINSTALLNAME=''
THREAD_CFLAGS=''
THREAD_LDFLAGS=''
INSTALL_TARGET='install'
case "${host_os}" in
# libdir may have a dollar expression inside
linux*)
@ -197,6 +199,7 @@ case "${host_os}" in
SHAREDPREFIX=''
SHAREDEXT='dll'
PICFLAG=''
INSTALL_TARGET='flatinstall'
;;
darwin*)
thehost='darwin'

5
src/configure vendored
View file

@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS GCLIB SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT INFOEXT INSTALL_INFO CLX_INFO CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS GCLIB SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME INSTALL_TARGET ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT INFOEXT INSTALL_INFO CLX_INFO CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -3868,6 +3868,7 @@ PICFLAG='-fPIC'
LDINSTALLNAME=''
THREAD_CFLAGS=''
THREAD_LDFLAGS=''
INSTALL_TARGET='install'
case "${host_os}" in
# libdir may have a dollar expression inside
linux*)
@ -3926,6 +3927,7 @@ case "${host_os}" in
SHAREDPREFIX=''
SHAREDEXT='dll'
PICFLAG=''
INSTALL_TARGET='flatinstall'
;;
darwin*)
thehost='darwin'
@ -6779,6 +6781,7 @@ s,@LIBEXT@,$LIBEXT,;t t
s,@SHAREDEXT@,$SHAREDEXT,;t t
s,@SHAREDPREFIX@,$SHAREDPREFIX,;t t
s,@LDINSTALLNAME@,$LDINSTALLNAME,;t t
s,@INSTALL_TARGET@,$INSTALL_TARGET,;t t
s,@ECL_SETJMP@,$ECL_SETJMP,;t t
s,@ECL_LONGJMP@,$ECL_LONGJMP,;t t
s,@ECL_FILE_CNT@,$ECL_FILE_CNT,;t t