Update of /cvsroot/mahogany/M/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31916/src
Modified Files:
Makefile
Log Message:
changed "make install" under Unix to be more consistent with FSSTD and common sense:
1. binary is now installed in $prefix/bin
2. $prefix/share/mahogany (and not Mahogany) contains only arch-independent files
3. modules are now in $prefix/lib/mahogany/modules
4. code has been updated accordingly and tweaked to ensure that everything
works both after and before the installation
5. some preliminary/untested code for Mac OS X bundle directory detection added
Index: Makefile
===================================================================
RCS file: /cvsroot/mahogany/M/src/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -b -u -2 -r1.98 -r1.99
--- Makefile 10 Jan 2004 21:57:01 -0000 1.98
+++ Makefile 12 Jan 2004 17:48:28 -0000 1.99
@@ -139,12 +139,10 @@
install:
- $(INSTALL_PROGRAM) $(INSTALL_OPTIONS) M $(DATADIR)/$(CANONICAL_HOST)/bin
+ $(INSTALL_PROGRAM) $(INSTALL_OPTIONS) M $(BINDIR)
+ $(RM) $(BINDIR)/mahogany
+ ln -s M $(BINDIR)/mahogany
if test -f libM.so; \
- then $(INSTALL_PROGRAM) libM.so $(DATADIR)/$(CANONICAL_HOST)/lib; \
+ then $(INSTALL_PROGRAM) libM.so $(LIBDIR); \
fi
- $(RM) -f $(BINDIR)/M $(DATADIR)/bin/M
- ln -f -s ../share/Mahogany/$(CANONICAL_HOST)/bin/M $(BINDIR)/M
- $(RM) $(BINDIR)/mahogany
- ln -f -s ../share/Mahogany/$(CANONICAL_HOST)/bin/M $(BINDIR)/mahogany
ifeq ($(USE_MODULES),dynamic)
$(INSTALL) -d $(MODULEDIR)
@@ -157,6 +155,10 @@
done
ifdef USE_PYTHON
+ $(INSTALL) -d $(DATADIR)/python
+ for i in Python/*.py; \
+ do $(INSTALL_DATA) $$i $(DATADIR)/python; \
+ done
$(INSTALL) -d $(DATADIR)/scripts
- for i in Python/*.py Python/.src/Scripts/*.py; \
+ for i in Python/.src/Scripts/*.py; \
do $(INSTALL_DATA) $$i $(DATADIR)/scripts; \
done
@@ -167,5 +169,4 @@
ifeq "$(TRANSLATIONS)" "yes"
cd .src; exec $(XGETTEXT) -C -k_ -o $(BUILDDIR)/messages.po $(MSGSRC)
-# Yes, there really are some translatable strings in ../include
$(MAKE) -C ../include msgcat
else
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
