[GRASS-SVN] r74039 - in grass/branches/releasebranch_7_6: include/Make mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-01-28 02:05:06 -0800 (Mon, 28 Jan 2019)
New Revision: 74039

Modified:
   grass/branches/releasebranch_7_6/include/Make/Grass.make
   grass/branches/releasebranch_7_6/include/Make/Shlib.make
   grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh
Log:
change libname to major.minor, see #3728 (g76: merge r74021, r74023, r7430)

Modified: grass/branches/releasebranch_7_6/include/Make/Grass.make
===================================================================
--- grass/branches/releasebranch_7_6/include/Make/Grass.make	2019-01-28 09:56:40 UTC (rev 74038)
+++ grass/branches/releasebranch_7_6/include/Make/Grass.make	2019-01-28 10:05:06 UTC (rev 74039)
@@ -67,7 +67,7 @@
 FONTDIR         = $(ARCH_DISTDIR)/fonts
 
 GRASS_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE)
-GRASS_VERSION_NAME    = $(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)$(GRASS_VERSION_RELEASE)
+GRASS_LIB_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
 
 GRASS_NAME	= grass$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 
@@ -265,7 +265,7 @@
 endif
 
 define lib_rules
-$(1)_LIBNAME = grass_$(2).$(GRASS_VERSION_NUMBER)
+$(1)_LIBNAME = grass_$(2).$(GRASS_LIB_VERSION_NUMBER)
 ifneq ($(NEED_DEPS),)
 $(1)LIB = -l$$($(1)_LIBNAME) $$($(1)DEPS)
 else

Modified: grass/branches/releasebranch_7_6/include/Make/Shlib.make
===================================================================
--- grass/branches/releasebranch_7_6/include/Make/Shlib.make	2019-01-28 09:56:40 UTC (rev 74038)
+++ grass/branches/releasebranch_7_6/include/Make/Shlib.make	2019-01-28 10:05:06 UTC (rev 74039)
@@ -9,7 +9,7 @@
 $(SHLIB): $(SHLIB_OBJS)
 	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
 ifndef MINGW
-	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_LIB_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
 endif
 
 shlib: $(SHLIB)

Modified: grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh	2019-01-28 09:56:40 UTC (rev 74038)
+++ grass/branches/releasebranch_7_6/mswindows/osgeo4w/package.sh	2019-01-28 10:05:06 UTC (rev 74039)
@@ -226,7 +226,7 @@
 if [ -n "$PACKAGE_PATCH" ]; then
     log building vc libraries 
     OSGEO4W_POSTFIX=$OSGEO4W_POSTFIX sh \
-        mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/lib/*.$VERSION.dll 
+        mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/lib/*.${MAJOR}.${MINOR}.dll 
     mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass$POSTFIX/lib
     
     log creating package