[GRASS-SVN] r74021 - grass/trunk/include/Make

[svn_grass at osgeo.org]

Author: martinl
Date: 2019-01-26 04:02:41 -0800 (Sat, 26 Jan 2019)
New Revision: 74021

Modified:
   grass/trunk/include/Make/Grass.make
   grass/trunk/include/Make/Shlib.make
Log:
change libname to major.minor, see #3728

Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2019-01-26 11:11:58 UTC (rev 74020)
+++ grass/trunk/include/Make/Grass.make	2019-01-26 12:02:41 UTC (rev 74021)
@@ -68,6 +68,7 @@
 
 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 +266,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/trunk/include/Make/Shlib.make
===================================================================
--- grass/trunk/include/Make/Shlib.make	2019-01-26 11:11:58 UTC (rev 74020)
+++ grass/trunk/include/Make/Shlib.make	2019-01-26 12:02:41 UTC (rev 74021)
@@ -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)