Skip to content
Browse files

Fix GAC lib location on 64 bit builds

  • Loading branch information...
1 parent 1a1adb8 commit 1926a4529e10ca5829924dcc5d8c9650cc98ea7f @gburt gburt committed
Showing with 9 additions and 3 deletions.
  1. +3 −3 GKeyFile/Makefile.am
  2. +6 −0 configure.in
View
6 GKeyFile/Makefile.am
@@ -19,7 +19,7 @@ DISTCLEANFILES= AssemblyInfo.cs
noinst_DATA = gkeyfile-sharp.dll
-moduledir = $(libdir)/mono/gkeyfile-sharp/
+moduledir = $(prefix)/lib/mono/gkeyfile-sharp/
module_SCRIPTS = gkeyfile-sharp.dll.config
all: gkeyfile-sharp.dll
@@ -36,8 +36,8 @@ gkeyfile-sharp.dll: AssemblyInfo.cs $(GENERATED_SRCS)
$(CSC) -keyfile:$(top_srcdir)/gkeyfile-sharp.snk -out:$@ -unsafe -target:library $(GLIB_SHARP_LIBS) $^
install-data-local:
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package gkeyfile-sharp /root $(DESTDIR)$(libdir)"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package gkeyfile-sharp /root $(DESTDIR)$(libdir) || exit 1;
+ echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;
uninstall-local:
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package gkeyfile-sharp /root $(DESTDIR)$(libdir)"; \
View
6 configure.in
@@ -3,6 +3,9 @@ AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(gkeyfile-sharp, 0.2)
AM_MAINTAINER_MODE
+ASSEMBLY_NAME="$PACKAGE"
+ASSEMBLY_VERSION="$VERSION"
+
API_VERSION=1.0.0.0
AC_SUBST(API_VERSION)
@@ -57,6 +60,9 @@ fi
AC_SUBST(GACUTIL)
+GACUTIL_FLAGS='/package $(ASSEMBLY_NAME) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib'
+AC_SUBST(GACUTIL_FLAGS)
+
AC_OUTPUT([
Makefile
GKeyFile/gkeyfile-sharp.dll.config

0 comments on commit 1926a45

Please sign in to comment.
Something went wrong with that request. Please try again.