some cleaning

svn: r3541
This commit is contained in:
Eli Barzilay 2006-06-29 16:06:28 +00:00
parent 0dca64f8f4
commit ef8042997a
3 changed files with 12 additions and 20 deletions

View File

@ -53,7 +53,7 @@ install-normal:
mredinstall-stub: @MAKE_MREDINSTALL@
setup-plt:
$(DESTDIR)$(bindir)/mzscheme -mvqX "$(DESTDIR)$(collectsdir)" -M setup
"$(DESTDIR)$(bindir)/mzscheme" -mvqX "$(DESTDIR)$(collectsdir)" -M setup
plain-install-3m:
$(MAKE) install-normal
@ -70,7 +70,7 @@ mredinstall3m-stub: @MAKE_MREDINSTALL3M@
clean:
cd mzscheme; $(MAKE) clean
if [ -d mred ] ; then cd mred; $(MAKE) clean; fi
if [ -d mred ]; then cd mred; $(MAKE) clean; fi
mz:
@ -108,12 +108,12 @@ copytree:
mzscheme/mzscheme -mvxqu \
"$(srcdir)/../collects/setup/unixstyle-install.ss" \
make-install-copytree "$(srcdir)/.." \
$(ALLDIRINFO) @INSTALL_ORIG_TREE@
$(ALLDIRINFO) "@INSTALL_ORIG_TREE@"
fix-paths:
if [ "$(DESTDIR)" != "" ]; then \
mzscheme/mzscheme -mvxqu \
"$(srcdir)/../collects/setup/unixstyle-install.ss" \
make-install-destdir-fix "$(srcdir)/.." \
$(ALLDIRINFO) @INSTALL_ORIG_TREE@; \
$(ALLDIRINFO) "@INSTALL_ORIG_TREE@"; \
fi

View File

@ -232,11 +232,6 @@ $(srcdir)/src/mzmark.c: $(srcdir)/src/mzmarksrc.c $(srcdir)/src/mkmark.ss
cstartup.zo:
$(MAKE) startup CSTARTUPEXTRA='zo' CSTARTUPDEST="../cstartup.zo"
zo:
rm -f ../collects/mzlib/compiled/*.zo
rm -f ../collects/mzlib/compiled/*/*.so
$(MZSCHEME) -qf mkmzlib.ss -e '(make-zo)' -e '(exit)'
3m:
$(MAKE) bin
cd gc2; $(MAKE) all
@ -266,7 +261,7 @@ clean@OSX@:
rm -rf PLT_MzScheme.framework
$(MAKE) clean@NOT_OSX@
BUILDINFO="$(DESTDIR)$(libpltdir)/buildinfo"
BUILDINFO=$(DESTDIR)$(libpltdir)/buildinfo
ICP=@ICP@
install:
@ -292,12 +287,12 @@ unix-install:
cd ..; $(ICP) mzscheme/mzscheme "$(DESTDIR)$(bindir)/mzscheme"
cd ..; cp mzscheme/starter "$(DESTDIR)$(libpltdir)/starter"
./mzscheme -mvqu "$(srcdir)/collects-path.ss" "$(DESTDIR)$(bindir)/mzscheme@EXE_SUFFIX@" @COLLECTS_PATH@
cd ..; echo 'CC=@CC@' > $(BUILDINFO)
cd ..; echo 'CFLAGS=@CFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> $(BUILDINFO)
cd ..; echo 'OPTIONS=@OPTIONS@' >> $(BUILDINFO)
cd ..; echo 'MZOPTIONS=@MZOPTIONS@' >> $(BUILDINFO)
cd ..; echo "LDFLAGS=@LDFLAGS@" >> $(BUILDINFO)
cd ..; echo 'LIBS=@LIBS@' >> $(BUILDINFO)
cd ..; echo 'CC=@CC@' > "$(BUILDINFO)"
cd ..; echo 'CFLAGS=@CFLAGS@ @PREFLAGS@ @COMPFLAGS@' >> "$(BUILDINFO)"
cd ..; echo 'OPTIONS=@OPTIONS@' >> "$(BUILDINFO)"
cd ..; echo 'MZOPTIONS=@MZOPTIONS@' >> "$(BUILDINFO)"
cd ..; echo "LDFLAGS=@LDFLAGS@" >> "$(BUILDINFO)"
cd ..; echo 'LIBS=@LIBS@' >> "$(BUILDINFO)"
normal-install:
$(MAKE) unix-install
@ -327,6 +322,3 @@ install-3m@OSX@:
unix-cygwin-install:
$(MAKE) unix-install
cd dynsrc; $(MAKE) cygwin-install
config:
autoconf $(srcdir)/configure.ac | mzscheme -qr $(srcdir)/clean_ac.ss > $(srcdir)/../configure

View File

@ -1,7 +1,7 @@
#################################################################
# This is the source for the `configure' script, to be compiled #
# by autoconf. #
# by autoconf (use make-configure in this directory). #
#################################################################
# Remember: