Selaa lähdekoodia

change libname to major.minor, see https://trac.osgeo.org/grass/ticket/3728

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74021 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 6 vuotta sitten
vanhempi
commit
84d74b091e
2 muutettua tiedostoa jossa 3 lisäystä ja 2 poistoa
  1. 2 1
      include/Make/Grass.make
  2. 1 1
      include/Make/Shlib.make

+ 2 - 1
include/Make/Grass.make

@@ -68,6 +68,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 +266,7 @@ LIB_SUFFIX = $(SHLIB_SUFFIX)
 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

+ 1 - 1
include/Make/Shlib.make

@@ -9,7 +9,7 @@ LDFLAGS += $(SHLIB_LDFLAGS)
 $(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)