[GRASS-SVN] r46163 - in grass/branches/develbranch_6: include/Make raster/r.li/r.li.daemon

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-05-03 04:36:09 -0700 (Tue, 03 May 2011)
New Revision: 46163

Modified:
   grass/branches/develbranch_6/include/Make/Shlib.make
   grass/branches/develbranch_6/raster/r.li/r.li.daemon/Makefile
Log:
re-enable unversioned libs as symlinks
fix rli lib name


Modified: grass/branches/develbranch_6/include/Make/Shlib.make
===================================================================
--- grass/branches/develbranch_6/include/Make/Shlib.make	2011-05-03 04:59:07 UTC (rev 46162)
+++ grass/branches/develbranch_6/include/Make/Shlib.make	2011-05-03 11:36:09 UTC (rev 46163)
@@ -16,7 +16,8 @@
 
 $(SHLIB): $(SHLIB_OBJS)
 	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
-	# && \(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+ifndef MINGW
+	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+endif
 
 shlib: $(SHLIB)
-

Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/Makefile
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/Makefile	2011-05-03 04:59:07 UTC (rev 46162)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/Makefile	2011-05-03 11:36:09 UTC (rev 46163)
@@ -2,7 +2,7 @@
 
 EXTRA_LIBS=$(GISLIB) $(MATHLIB)
 
-LIB_NAME = grass_rli
+LIB_NAME = grass_rli.$(GRASS_VERSION_NUMBER)
 
 LIB_OBJS = daemon.o list.o ipc.o worker.o GenericCell.o	avl.o avlID.o