You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/12/12 17:57:38 UTC
svn commit: r356282 - /tcl/websh/trunk/src/unix/Makefile.in
Author: ronnie
Date: Mon Dec 12 08:57:29 2005
New Revision: 356282
URL: http://svn.apache.org/viewcvs?rev=356282&view=rev
Log:
- install directly to prefix (not into websh subdirectory)
- refactored ugly hack for Darwin bundle linking of mod_websh
Modified:
tcl/websh/trunk/src/unix/Makefile.in
Modified: tcl/websh/trunk/src/unix/Makefile.in
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/unix/Makefile.in?rev=356282&r1=356281&r2=356282&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/Makefile.in (original)
+++ tcl/websh/trunk/src/unix/Makefile.in Mon Dec 12 08:57:29 2005
@@ -85,7 +85,7 @@
srcdir = @srcdir@
prefix = @prefix@
-DESTDIR = $(prefix)/websh
+DESTDIR = $(prefix)
bindir = $(DESTDIR)/bin
libdir = $(DESTDIR)/lib
@@ -112,7 +112,12 @@
RANLIB = @RANLIB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
-SHLIB_LD_DARWIN = $(CC) -bundle -bundle_loader $(HTTPD_BIN) $(LDFLAGS)
+Platform=$(shell uname -s)
+ifeq ($(Platform),Darwin)
+SHLIB_LD_CURRENT = $(CC) -bundle -bundle_loader $(HTTPD_BIN) $(LDFLAGS)
+else
+SHLIB_LD_CURRENT = $(SHLIB_LD) $(TCL_LD_FLAGS)
+endif
SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
STLIB_LD = @STLIB_LD@
@@ -172,7 +177,7 @@
libraries: mod_websh.so
-install: all install-binaries install-libraries install-links install-doc
+install: all install-binaries install-libraries install-doc
# =============================================================================
# Dist target - to make the tarball.
@@ -252,13 +257,8 @@
$(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
$(TCL_LIB_SPEC) $(TCL_LIBS) $(TCL_LD_FLAGS) -o websh$(VERSION)
-
mod_websh$(MODULE_LIB_SUFFIX): $(web_ap_OBJECTS)
- if test "`uname -s`" = "Darwin" ; then \
- $(SHLIB_LD_DARWIN) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC); \
- else \
- $(SHLIB_LD) $(TCL_LD_FLAGS) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC); \
- fi
+ $(SHLIB_LD_CURRENT) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC)
mod_websh$(UNSHARED_LIB_SUFFIX): $(web_ap_OBJECTS)
$(STLIB_LD) $(TCL_LD_FLAGS) -o mod_websh$(UNSHARED_LIB_SUFFIX) $(web_ap_OBJECTS)
@@ -321,19 +321,6 @@
install-libraries: install-dirs libraries
cp -f mod_websh$(VERSION).so $(moddir)
ln -s mod_websh$(VERSION).so $(moddir)/mod_websh.so
-
-# links to installation
-install-links: install-dirs
- @if [ -d $(prefix)/lib ]; then \
- echo "Linking libs to $(prefix)/lib"; \
- ln -s $(libdir)/libmo $(prefix)/lib/libmo; \
- ln -s $(libdir)/libvermo $(prefix)/lib/libvermo; \
- fi
- @if [ -d $(prefix)/bin ]; then \
- echo "Linking exectable to $(prefix)/bin"; \
- ln -s $(bindir)/websh $(prefix)/lib/websh; \
- ln -s $(bindir)/webshver $(prefix)/lib/webshver; \
- fi
# documentation / sample mod_websh setup
install-doc: install-dirs
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org