--- Makefile.orig 2025-09-05 17:23:15 UTC +++ Makefile @@ -7,39 +7,15 @@ MSGSRC = $(wildcard po/*.po) TOLOCALIZE = src/extension.js src/prefs.js src/appIcons.js src/taskbar.js MSGSRC = $(wildcard po/*.po) -ifeq ($(strip $(DESTDIR)),) - INSTALLTYPE = local - INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions -else - INSTALLTYPE = system - INSTALLBASE = $(DESTDIR)/usr/share/gnome-shell/extensions - SHARE_PREFIX = $(DESTDIR)/usr/share -endif +INSTALLBASE = $(DESTDIR)%%LOCALBASE%%/share/gnome-shell/extensions INSTALLNAME = dash-to-panel@jderose9.github.com -# The command line passed variable VERSION is used to set the version string -# in the metadata and in the generated zip-file. If no VERSION is passed, the -# version is pulled from the latest git tag and the current commit SHA1 is -# added to the metadata -ifdef VERSION - ifdef TARGET - FILESUFFIX = _v$(VERSION)_$(TARGET) - else - FILESUFFIX = _v$(VERSION) - endif -else - LATEST_TAG = $(shell git describe --match "v[0-9]*" --abbrev=0 --tags HEAD) - VERSION = $(LATEST_TAG:v%=%) - COMMIT = $(shell git rev-parse HEAD) - FILESUFFIX = -endif - all: extension clean: rm -f ./schemas/gschemas.compiled -extension: ./schemas/gschemas.compiled $(MSGSRC:.po=.mo) +extension: $(MSGSRC:.po=.mo) ./schemas/gschemas.compiled: ./schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml glib-compile-schemas ./schemas/ @@ -69,7 +45,6 @@ install-local: _build install: install-local install-local: _build - rm -rf $(INSTALLBASE)/$(INSTALLNAME) mkdir -p $(INSTALLBASE)/$(INSTALLNAME) cp -r ./_build/* $(INSTALLBASE)/$(INSTALLNAME)/ ifeq ($(INSTALLTYPE),system) @@ -88,17 +63,13 @@ _build: all -rm -fR _build _build: all - -rm -fR ./_build mkdir -p _build - cp $(MODULES) _build + cp $(MODULES) _build/ mkdir -p _build/ui - cp $(UI_MODULES) _build/ui + cp $(UI_MODULES) _build/ui/ mkdir -p _build/img cd img ; cp $(IMAGES) ../_build/img/ - mkdir -p _build/schemas - cp schemas/*.xml _build/schemas/ - cp schemas/gschemas.compiled _build/schemas/ mkdir -p _build/locale for l in $(MSGSRC:.po=.mo) ; do \ lf=_build/locale/`basename $$l .mo`; \ @@ -106,8 +77,3 @@ _build: all mkdir -p $$lf/LC_MESSAGES; \ cp $$l $$lf/LC_MESSAGES/dash-to-panel.mo; \ done; -ifneq ($(and $(COMMIT),$(VERSION)),) - sed -i 's/"version": [[:digit:]][[:digit:]]*/"version": $(VERSION),\n"commit": "$(COMMIT)"/' _build/metadata.json; -else ifneq ($(VERSION),) - sed -i 's/"version": [[:digit:]][[:digit:]]*/"version": $(VERSION)/' _build/metadata.json; -endif