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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-05-03 05:29:48 -0700 (Tue, 03 May 2011)
New Revision: 46165

Modified:
   grass/branches/releasebranch_6_4/include/Make/Shlib.make
   grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/Makefile
Log:
don't produce unversioned libs as symlinks on mingw
fix rli lib name


Modified: grass/branches/releasebranch_6_4/include/Make/Shlib.make
===================================================================
--- grass/branches/releasebranch_6_4/include/Make/Shlib.make	2011-05-03 12:12:32 UTC (rev 46164)
+++ grass/branches/releasebranch_6_4/include/Make/Shlib.make	2011-05-03 12:29:48 UTC (rev 46165)
@@ -15,7 +15,9 @@
 LDFLAGS += $(SHLIB_LDFLAGS)
 
 $(SHLIB): $(SHLIB_OBJS)
-	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ) && \
+	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ)
+ifndef MINGW
 	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+endif
 
 shlib: $(SHLIB)

Modified: grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/Makefile	2011-05-03 12:12:32 UTC (rev 46164)
+++ grass/branches/releasebranch_6_4/raster/r.li/r.li.daemon/Makefile	2011-05-03 12:29:48 UTC (rev 46165)
@@ -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