[geany/geany-plugins] 69af4d: Try and reduce code duplication while simplifying altering paths

Colomban Wendling git-noreply at xxxxx
Sat Mar 12 18:58:39 UTC 2016


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 12 Mar 2016 18:58:39 UTC
Commit:      69af4d80499424cbae03cf1cc18123eb147e369a
             https://github.com/geany/geany-plugins/commit/69af4d80499424cbae03cf1cc18123eb147e369a

Log Message:
-----------
Try and reduce code duplication while simplifying altering paths


Modified Paths:
--------------
    build/vars.build.mk

Modified: build/vars.build.mk
50 lines changed, 27 insertions(+), 23 deletions(-)
===================================================================
@@ -1,32 +1,36 @@
 if MINGW
-LOCAL_AM_CFLAGS = \
-	-DLOCALEDIR=\""share/locale"\" \
-	-DPREFIX=\"\" \
-	-DDOCDIR=\""share/doc/$(PACKAGE)"\" \
-	-DGEANYPLUGINS_DATADIR=\""share"\" \
-	-DPKGDATADIR=\""share/$(PACKAGE)"\" \
-	-DLIBDIR=\""lib"\" \
-	-DPKGLIBDIR=\""lib/$(PACKAGE)"\" \
-	-DPLUGINDATADIR=\""share/$(PACKAGE)/$(plugin)"\" \
-	-DPLUGINDOCDIR=\""$(plugin)"\" \
-	-DPLUGINLIBDIR=\""lib/$(PACKAGE)/$(plugin)"\"
+GP_PREFIX				= .
+GP_DATADIR				= $(GP_PREFIX)/share
+GP_LOCALEDIR			= $(GP_DATADIR)/locale
+GP_DOCDIR				= $(GP_DATADIR)/doc/$(PACKAGE)
+GP_PKGDATADIR			= $(GP_DATADIR)/$(PACKAGE)
+GP_LIBDIR				= $(GP_PREFIX)/lib
+GP_PKGLIBDIR			= $(GP_LIBDIR)/$(PACKAGE)
 else
-LOCAL_AM_CFLAGS = \
-	-DLOCALEDIR=\""$(LOCALEDIR)"\" \
-	-DPREFIX=\""$(prefix)"\" \
-	-DDOCDIR=\""$(docdir)"\" \
-	-DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \
-	-DPKGDATADIR=\""$(pkgdatadir)"\" \
-	-DLIBDIR=\""$(libdir)"\" \
-	-DPKGLIBDIR=\""$(pkglibdir)"\" \
-	-DPLUGINDATADIR=\""$(pkgdatadir)/$(plugin)"\" \
-	-DPLUGINDOCDIR=\""$(docdir)/$(plugin)"\" \
-	-DPLUGINLIBDIR=\""$(pkglibdir)/$(plugin)"\"
+GP_PREFIX				= $(prefix)
+GP_DATADIR				= $(datadir)
+GP_LOCALEDIR			= $(LOCALEDIR)
+GP_DOCDIR				= $(docdir)
+GP_PKGDATADIR			= $(pkgdatadir)
+GP_LIBDIR				= $(libdir)
+GP_PKGLIBDIR			= $(pkglibdir)
 endif
 
+LOCAL_AM_CFLAGS = \
+	-DLOCALEDIR=\""$(GP_LOCALEDIR)"\" \
+	-DPREFIX=\""$(GP_PREFIX)"\" \
+	-DDOCDIR=\""$(GP_DOCDIR)"\" \
+	-DGEANYPLUGINS_DATADIR=\""$(GP_DATADIR)"\" \
+	-DPKGDATADIR=\""$(GP_PKGDATADIR)"\" \
+	-DLIBDIR=\""$(GP_LIBDIR)"\" \
+	-DPKGLIBDIR=\""$(GP_PKGLIBDIR)"\" \
+	-DPLUGINDATADIR=\""$(GP_PKGDATADIR)/$(plugin)"\" \
+	-DPLUGINDOCDIR=\""$(GP_DOCDIR)/$(plugin)"\" \
+	-DPLUGINLIBDIR=\""$(GP_PKGLIBDIR)/$(plugin)"\" \
+	-DPLUGIN="\"$(plugin)\""
+
 AM_CFLAGS = \
 	${LOCAL_AM_CFLAGS} \
-	-DPLUGIN="\"$(plugin)\"" \
 	$(GEANY_CFLAGS) \
 	$(GP_CFLAGS)
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Plugins-Commits mailing list