Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix GAC lib location on 64 bit builds
  • Loading branch information
gburt committed Nov 11, 2010
1 parent 1a1adb8 commit 1926a45
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 3 additions & 3 deletions GKeyFile/Makefile.am
Expand Up @@ -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
Expand All @@ -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)"; \
Expand Down
6 changes: 6 additions & 0 deletions configure.in
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1926a45

Please sign in to comment.