gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 18:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #150 from buzzdeee/declutter_INTERFACE_VERSION

Browse source 
Don't misuse libgnustep-gui_INTERFACE_VERSION to define Resource Inst…
This commit is contained in:
Fred Kiefer 2022-08-21 22:30:04 +02:00 committed by GitHub
commit 645fa46a65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Panels/GNUmakefile.postamble
View file

@ -28,8 +28,7 @@
# it.
include ../Version
libgnustep-gui_INTERFACE_VERSION=$(GNUSTEP_GUI_MAJOR_VERSION).$(GNUSTEP_GUI_MINOR_VERSION)
POSTAMBLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-gui/Versions/$(libgnustep-gui_INTERFACE_VERSION)/Resources
POSTAMBLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-gui/Versions/$(GNUSTEP_GUI_MAJOR_VERSION).$(GNUSTEP_GUI_MINOR_VERSION)/Resources
# Things to do after installing
after-install::

3
Resources/GNUmakefile
View file

@ -28,10 +28,9 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
libgnustep-gui_INTERFACE_VERSION=$(GNUSTEP_GUI_MAJOR_VERSION).$(GNUSTEP_GUI_MINOR_VERSION)
RESOURCE_SET_NAME = gui-resources
gui-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-gui/Versions/$(libgnustep-gui_INTERFACE_VERSION)/Resources
gui-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-gui/Versions/$(GNUSTEP_GUI_MAJOR_VERSION).$(GNUSTEP_GUI_MINOR_VERSION)/Resources
gui-resources_LANGUAGES = English Italian Lojban Esperanto German French Spanish Korean Japanese Polish
gui-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings

5
Source/GNUmakefile
View file

@ -29,9 +29,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ../config.make
# Interface version changes with each minor release
libgnustep-gui_INTERFACE_VERSION=${GNUSTEP_GUI_MAJOR_VERSION}.${GNUSTEP_GUI_MINOR_VERSION}
srcdir = .
PACKAGE_NAME = gnustep-gui
LIBRARY_VAR = GNUSTEP_GUI
@ -671,7 +668,7 @@ HEADERS_INSTALL = ${APPKIT_HEADERS} \
# Resources
RESOURCE_SET_NAME = libgui-resources
libgui-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-gui/Versions/$(libgnustep-gui_INTERFACE_VERSION)/Resources
libgui-resources_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-gui/Versions/${GNUSTEP_GUI_MAJOR_VERSION}.${GNUSTEP_GUI_MINOR_VERSION}/Resources
libgui-resources_RESOURCE_DIRS =
libgui-resources_RESOURCE_FILES = Info-gnustep.plist