Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv31916
Modified Files:
Makefile makeopts.in
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/Makefile,v
retrieving revision 1.71
retrieving revision 1.72
diff -b -u -2 -r1.71 -r1.72
--- Makefile 19 Aug 2003 22:01:13 -0000 1.71
+++ Makefile 12 Jan 2004 17:48:28 -0000 1.72
@@ -77,7 +77,4 @@
$(BINDIR) \
$(DATADIR) \
- $(DATADIR)/$(CANONICAL_HOST) \
- $(DATADIR)/$(CANONICAL_HOST)/bin \
- $(DATADIR)/$(CANONICAL_HOST)/lib \
$(DOCDIR) \
$(DOCDIR)/Tips \
@@ -123,5 +120,4 @@
@echo "$(DATADIR)/kylemail.wav" >> filelist
@echo "$(DATADIR)/afm" >> filelist
- @echo "$(DATADIR)/$(CANONICAL_HOST)" >> filelist
@echo "$(DATADIR)/icons" >> filelist
@echo "$(DATADIR)/locale" >> filelist
Index: makeopts.in
===================================================================
RCS file: /cvsroot/mahogany/M/makeopts.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -b -u -2 -r1.106 -r1.107
--- makeopts.in 19 Aug 2003 00:05:12 -0000 1.106
+++ makeopts.in 12 Jan 2004 17:48:28 -0000 1.107
@@ -104,14 +104,16 @@
DESTDIR = @prefix@
-# Directory in which to install scripts.
+# Directory in which to install binaries and scripts
BINDIR = $(DESTDIR)/bin
-# Directory in which to install library files.
-DATADIR = $(DESTDIR)/share/Mahogany
+# Directory in which to install loadable modules
+LIBDIR = $(DESTDIR)/lib/mahogany
+# Directory in which to install loadable modules
+MODULEDIR = $(LIBDIR)/modules
+# Directory in which to install message catalogs
+LOCALEDIR = $(DESTDIR)/share/locale
+# Directory in which to install arch-independent data files
+DATADIR = $(DESTDIR)/share/mahogany
# where to install docs
DOCDIR = $(DATADIR)/doc
-
-# for the dynamic linker, better than using -rpath
-LD_RUN_PATH=$(DATADIR)/$(CANONICAL_HOST)/lib
-MODULEDIR=$(DATADIR)/$(CANONICAL_HOST)/modules
LINK = $(CXX)
-------------------------------------------------------
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
