Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:MasterPatricko
mosml
mosml-dirfixes.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File mosml-dirfixes.patch of Package mosml
diff -Naur -x TAGS -x '*~' mosml.orig/src/compiler/Makefile mosml.new/src/compiler/Makefile --- mosml.orig/src/compiler/Makefile 2000-06-27 16:46:19.000000000 +0200 +++ mosml.new/src/compiler/Makefile 2006-12-21 10:24:25.000000000 +0100 @@ -117,9 +117,9 @@ rm -f Makefile.bak install: - ${INSTALL_DATA} mosmlcmp $(LIBDIR) - ${INSTALL_DATA} mosmllnk $(LIBDIR) - ${INSTALL_DATA} mosmltop $(LIBDIR) + ${INSTALL_DATA} mosmlcmp $(DESTDIR)$(LIBDIR) + ${INSTALL_DATA} mosmllnk $(DESTDIR)$(LIBDIR) + ${INSTALL_DATA} mosmltop $(DESTDIR)$(LIBDIR) promote: test -f ../mosmlcmp.orig || cp ../mosmlcmp ../mosmlcmp.orig diff -Naur -x TAGS -x '*~' mosml.orig/src/config/Makefile mosml.new/src/config/Makefile --- mosml.orig/src/config/Makefile 2000-02-16 16:36:57.000000000 +0100 +++ mosml.new/src/config/Makefile 2006-12-21 10:24:24.000000000 +0100 @@ -4,7 +4,7 @@ @echo "Run 'sh autoconf' or 'sh autoconf gcc' or ..." install: - $(INSTALL_PROGRAM) m.h s.h $(INCDIR) + $(INSTALL_PROGRAM) m.h s.h $(DESTDIR)$(INCDIR) clean scratch: rm -f m.h s.h diff -Naur -x TAGS -x '*~' mosml.orig/src/doc/helpsigs/Makefile mosml.new/src/doc/helpsigs/Makefile --- mosml.orig/src/doc/helpsigs/Makefile 2000-08-02 14:06:16.000000000 +0200 +++ mosml.new/src/doc/helpsigs/Makefile 2006-12-21 10:31:17.000000000 +0100 @@ -22,10 +22,10 @@ makebase $(LIBDIR) install: - cp helpsigs.val $(LIBDIR) - test -d $(DOCDIR)/mosmllib || mkdir -p $(DOCDIR)/mosmllib - cp htmlsigs/*.html $(DOCDIR)/mosmllib - cp index.html $(DOCDIR)/mosmllib + cp helpsigs.val $(DESTDIR)$(LIBDIR) + test -d $(DESTDIR)$(DOCDIR)/mosmllib || mkdir -p $(DESTDIR)$(DOCDIR)/mosmllib + cp htmlsigs/*.html $(DESTDIR)$(DOCDIR)/mosmllib + cp index.html $(DESTDIR)$(DOCDIR)/mosmllib depend: Lexer.sml Parser.sml rm -f Makefile.bak diff -Naur -x TAGS -x '*~' mosml.orig/src/doc/Makefile mosml.new/src/doc/Makefile --- mosml.orig/src/doc/Makefile 2000-06-29 16:44:27.000000000 +0200 +++ mosml.new/src/doc/Makefile 2006-12-21 10:24:24.000000000 +0100 @@ -48,10 +48,10 @@ psnup -pa4 -2 mosmllib.ps mosmllib2up.ps install: - cp mosmlref.pdf $(DOCDIR) - cp manual.pdf $(DOCDIR) - cp mosmllib.pdf $(DOCDIR) - cp mosmllib2up.pdf $(DOCDIR) + cp mosmlref.pdf $(DESTDIR)$(DOCDIR) + cp manual.pdf $(DESTDIR)$(DOCDIR) + cp mosmllib.pdf $(DESTDIR)$(DOCDIR) + cp mosmllib2up.pdf $(DESTDIR)$(DOCDIR) cd helpsigs; make install clean: diff -Naur -x TAGS -x '*~' mosml.orig/src/launch/Makefile mosml.new/src/launch/Makefile --- mosml.orig/src/launch/Makefile 2000-01-21 11:07:13.000000000 +0100 +++ mosml.new/src/launch/Makefile 2006-12-21 10:24:24.000000000 +0100 @@ -8,18 +8,18 @@ # header cannot be generated until camlrunm is installed in $(BINDIR)... install: - (echo "#!$(BINDIR)/camlrunm"; \ + (echo "#!$(DESTDIR)$(BINDIR)/camlrunm"; \ echo "exit 2"; \ cat testprog) > /tmp/testscr chmod a+x /tmp/testscr sh -c 'if sh -c /tmp/testscr 2>/dev/null; \ - then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \ - else ${INSTALL_PROGRAM} camlexec$(EXE) $(LIBDIR)/header; \ + then echo "#!$(BINDIR)/camlrunm" > $(DESTDIR)$(LIBDIR)/header; \ + else ${INSTALL_PROGRAM} camlexec$(EXE) $(DESTDIR)$(LIBDIR)/header; \ fi' rm -f /tmp/testscr for script in mosml mosmlc mosmllex; do \ - ${INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \ - chmod a+x $(BINDIR)/$$script; \ + ${INSTALL_SCRIPT} $$script $(DESTDIR)$(BINDIR)/$$script; \ + chmod a+x $(DESTDIR)$(BINDIR)/$$script; \ done mosml: mosml.tpl diff -Naur -x TAGS -x '*~' mosml.orig/src/lex/Makefile mosml.new/src/lex/Makefile --- mosml.orig/src/lex/Makefile 2000-01-24 22:59:00.000000000 +0100 +++ mosml.new/src/lex/Makefile 2006-12-21 10:24:23.000000000 +0100 @@ -37,7 +37,7 @@ cd test; make clean install: - ${INSTALL_DATA} mosmllex $(LIBDIR) + ${INSTALL_DATA} mosmllex $(DESTDIR)$(LIBDIR) Grammar.sml Grammar.sig: Grammar.grm $(MOSMLYACC) Grammar.grm diff -Naur -x TAGS -x '*~' mosml.orig/src/Makefile mosml.new/src/Makefile --- mosml.orig/src/Makefile 2006-12-21 10:27:43.000000000 +0100 +++ mosml.new/src/Makefile 2006-12-21 11:00:36.000000000 +0100 @@ -45,11 +45,11 @@ # Install the Mosml system install: - test -d $(BINDIR) || mkdir -p $(BINDIR) - test -d $(LIBDIR) || mkdir -p $(LIBDIR) - test -d $(INCDIR) || mkdir -p $(INCDIR) - test -d $(DOCDIR) || mkdir -p $(DOCDIR) - test -d $(TOOLDIR) || mkdir -p $(TOOLDIR) + test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) + test -d $(DESTDIR)$(LIBDIR) || mkdir -p $(DESTDIR)$(LIBDIR) + test -d $(DESTDIR)$(INCDIR) || mkdir -p $(DESTDIR)$(INCDIR) + test -d $(DESTDIR)$(DOCDIR) || mkdir -p $(DESTDIR)$(DOCDIR) + test -d $(DESTDIR)$(TOOLDIR) || mkdir -p $(DESTDIR)$(TOOLDIR) cd runtime; make install cd config; make install cd launch; make all install @@ -58,7 +58,7 @@ cd compiler; make install cd toolssrc; make install cd lex; make install - (cd $(INCDIR)/..; rm -f config; ln -s include config) + #(cd $(DESTDIR)$(INCDIR)/..; rm -f config; ln -s include config) cd doc; make install # Remove all generated files diff -Naur -x TAGS -x '*~' mosml.orig/src/Makefile.inc mosml.new/src/Makefile.inc --- mosml.orig/src/Makefile.inc 2004-01-19 16:03:37.000000000 +0100 +++ mosml.new/src/Makefile.inc 2006-12-21 10:44:34.000000000 +0100 @@ -2,7 +2,8 @@ # Where to install stuff -MOSMLHOME=${HOME}/mosml +prefix=/usr +MOSMLHOME=${prefix}/lib/mosml # Various utility programs INSTALL_PROGRAM=cp @@ -113,11 +114,11 @@ # INCDIR contains the runtime system header files (for compiling dynlibs) # DOCDIR contains documentation -BINDIR=${MOSMLHOME}/bin -LIBDIR=${MOSMLHOME}/lib -INCDIR=${MOSMLHOME}/include -DOCDIR=${MOSMLHOME}/doc -TOOLDIR=${MOSMLHOME}/tools +BINDIR=${prefix}/bin +LIBDIR=${prefix}/lib/mosml +INCDIR=${prefix}/include/mosml +DOCDIR=${prefix}/share/doc/mosml-2.01 +TOOLDIR=${LIBDIR}/tools # LIBDIR=${MOSMLHOME}/lib/moscow_ml # TOOLDIR=${MOSMLHOME}/libexec/moscow_ml diff -Naur -x TAGS -x '*~' mosml.orig/src/mosmllib/Makefile mosml.new/src/mosmllib/Makefile --- mosml.orig/src/mosmllib/Makefile 2000-06-27 18:38:25.000000000 +0200 +++ mosml.new/src/mosmllib/Makefile 2006-12-21 10:56:33.000000000 +0100 @@ -39,14 +39,14 @@ rm -f Vector.sml Word.sml Word8Array.sml Word8Vector.sml Weak.sml install: - ${INSTALL_DATA} README $(LIBDIR) - ${INSTALL_DATA} *.ui $(LIBDIR) - ${INSTALL_DATA} *.uo $(LIBDIR) - ${INSTALL_DATA} *.sig $(LIBDIR) - ${INSTALL_DATA} General.fke $(LIBDIR)/General.sig - ${INSTALL_DATA} Meta.fke $(LIBDIR)/Meta.sig - rm -f $(LIBDIR)/camlrunm - ln -s $(BINDIR)/camlrunm $(LIBDIR)/camlrunm + ${INSTALL_DATA} README $(DESTDIR)$(LIBDIR) + ${INSTALL_DATA} *.ui $(DESTDIR)$(LIBDIR) + ${INSTALL_DATA} *.uo $(DESTDIR)$(LIBDIR) + ${INSTALL_DATA} *.sig $(DESTDIR)$(LIBDIR) + ${INSTALL_DATA} General.fke $(DESTDIR)$(LIBDIR)/General.sig + ${INSTALL_DATA} Meta.fke $(DESTDIR)$(LIBDIR)/Meta.sig + rm -f $(DESTDIR)$(LIBDIR)/camlrunm + ln -s $(BINDIR)/camlrunm $(DESTDIR)$(LIBDIR)/camlrunm depend: Array.sml FileSys.sml Help.sml Int.sml Mosml.sml Path.sml \ Process.sml Strbase.sml Vector.sml Word.sml Word8Array.sml \ diff -Naur -x TAGS -x '*~' mosml.orig/src/mosmlyac/Makefile mosml.new/src/mosmlyac/Makefile --- mosml.orig/src/mosmlyac/Makefile 2000-01-21 11:07:13.000000000 +0100 +++ mosml.new/src/mosmlyac/Makefile 2006-12-21 10:24:22.000000000 +0100 @@ -18,7 +18,7 @@ rm -f mosmlyac$(EXE) install: - ${INSTALL_PROGRAM} mosmlyac$(EXE) $(BINDIR)/mosmlyac$(EXE) + ${INSTALL_PROGRAM} mosmlyac$(EXE) $(DESTDIR)$(BINDIR)/mosmlyac$(EXE) depend: diff -Naur -x TAGS -x '*~' mosml.orig/src/runtime/Makefile mosml.new/src/runtime/Makefile --- mosml.orig/src/runtime/Makefile 2000-07-18 16:16:44.000000000 +0200 +++ mosml.new/src/runtime/Makefile 2006-12-21 10:24:22.000000000 +0100 @@ -46,8 +46,8 @@ rm -f .debugobj/*.o install: - ${INSTALL_PROGRAM} camlrunm$(EXE) $(BINDIR) - ${INSTALL_PROGRAM} *.h $(INCDIR) + ${INSTALL_PROGRAM} camlrunm$(EXE) $(DESTDIR)$(BINDIR) + ${INSTALL_PROGRAM} *.h $(DESTDIR)$(INCDIR) primitives : $(PRIMS) sed -n -e '/\/\* ML \*\//s/.* \([a-zA-Z0-9_][a-zA-Z0-9_]*\) *(.*/\1/p' \ diff -Naur -x TAGS -x '*~' mosml.orig/src/toolssrc/Makefile mosml.new/src/toolssrc/Makefile --- mosml.orig/src/toolssrc/Makefile 2000-01-21 11:07:13.000000000 +0100 +++ mosml.new/src/toolssrc/Makefile 2006-12-21 10:24:22.000000000 +0100 @@ -34,7 +34,7 @@ rm -f cutdeps mosmldep install: - ${INSTALL_DATA} cutdeps mosmldep $(TOOLDIR) + ${INSTALL_DATA} cutdeps mosmldep $(DESTDIR)$(TOOLDIR) depend: Deplex.sml Deppars.sml Mosmldep.sml rm -f Makefile.bak
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
