Skip to content

Commit

Permalink
Set docdir on Windows builds
Browse files Browse the repository at this point in the history
And remove unused define PKGLIBDIR and quote paths even.
  • Loading branch information
eht16 committed Mar 10, 2016
1 parent 6f5b1fd commit 02649ac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build/common.m4
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ AC_DEFUN([GP_COMMIT_PLUGIN_STATUS],
GP_STATUS_PLUGIN_ADD([$1], [$m4_tolower(AS_TR_SH(enable_$1))])
])

dnl GEANY_CHECK_MINGW
dnl GP_CHECK_MINGW
dnl Checks whether we're building for MinGW, and defines appropriate stuff
dnl if it is the case.
dnl Most importantly, AM_CODITIONALs MINGW
Expand Down
12 changes: 5 additions & 7 deletions build/vars.build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,25 @@ if MINGW
LOCAL_AM_CFLAGS = \
-DLOCALEDIR=\""share/locale"\" \
-DPREFIX=\"\" \
-DDOCDIR=\"\" \
-DGEANYPLUGINS_DATADIR=\"share\" \
-DDOCDIR=\""share/doc/geany-plugins"\" \
-DGEANYPLUGINS_DATADIR=\""share"\" \
-DPKGDATADIR=\""share/geany-plugins"\" \
-DLIBDIR=\""lib"\" \
-DPKGLIBDIR=\"\"
-DLIBDIR=\""lib"\"
else
LOCAL_AM_CFLAGS = \
-DLOCALEDIR=\""$(LOCALEDIR)"\" \
-DPREFIX=\""$(prefix)"\" \
-DDOCDIR=\""$(docdir)"\" \
-DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DPKGLIBDIR=\""$(pkglibdir)"\"
-DLIBDIR=\""$(libdir)"\"
endif

AM_CFLAGS = \
${LOCAL_AM_CFLAGS} \
$(GEANY_CFLAGS) \
$(GP_CFLAGS)


AM_LDFLAGS = -module -avoid-version -no-undefined $(GP_LDFLAGS)

Expand Down

0 comments on commit 02649ac

Please sign in to comment.