Download as
Browse Code »

Commit bcbb02626b91957014e06cc1acf54294a3ef4613

Authored by Perry Werneck
1 parent 9337c9da
Exists in master

Adjustments for windows packaging.

Showing 2 changed files with 28 additions and 7 deletions   Show diff stats
@@ -213,6 +213,27 @@ AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) @@ -213,6 +213,27 @@ AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
213 AC_SUBST(INTL_LIBS) 213 AC_SUBST(INTL_LIBS)
214 214
215 dnl --------------------------------------------------------------------------- 215 dnl ---------------------------------------------------------------------------
  216 +dnl Environment
  217 +dnl ---------------------------------------------------------------------------
  218 +
  219 +AC_ARG_VAR(GACROOT, [ The root for gacutil (default is /usr/lib) ] )
  220 +
  221 +if test -z "$GACROOT"; then
  222 + GACROOT="/usr/lib"
  223 +fi
  224 +
  225 +AC_SUBST(GACROOT)
  226 +
  227 +
  228 +AC_ARG_VAR(GAPIROOT, [ The root for gapi (default is /usr/share/gapi-2.0) ] )
  229 +
  230 +if test -z "$GAPIROOT"; then
  231 + GAPIROOT="/usr/share/gapi-2.0"
  232 +fi
  233 +
  234 +AC_SUBST(GAPIROOT)
  235 +
  236 +dnl ---------------------------------------------------------------------------
216 dnl Check for IPC3270 237 dnl Check for IPC3270
217 dnl --------------------------------------------------------------------------- 238 dnl ---------------------------------------------------------------------------
218 239
src/core/Makefile.in
  Diff comments   View file @bcbb026
@@ -74,16 +74,16 @@ Release: \ @@ -74,16 +74,16 @@ Release: \
74 install: \ 74 install: \
75 $(BINRLS)/$(LIBNAME) 75 $(BINRLS)/$(LIBNAME)
76 76
77 - @$(GACUTIL) -i $(BINRLS)/$(LIBNAME) -root $(DESTDIR)/usr/lib 77 + $(GACUTIL) -i $(BINRLS)/$(LIBNAME) -root $(DESTDIR)@GACROOT@
78 78
79 - @$(MKDIR) $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME)  
80 - @$(INSTALL_DATA) $(BINRLS)/$(MODULE_NAME).xml $(DESTDIR)/usr/share/gapi-2.0/$(MODULE_NAME) 79 + $(MKDIR) $(DESTDIR)@GAPIROOT@/$(MODULE_NAME)
  80 + $(INSTALL_DATA) $(BINRLS)/$(MODULE_NAME).xml $(DESTDIR)@GAPIROOT@/$(MODULE_NAME)
81 81
82 - @$(MKDIR) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@  
83 - @$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ 82 + $(MKDIR) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  83 + $(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/usr/lib/mono/$(MODULE_NAME)-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
84 84
85 - @$(MKDIR) $(DESTDIR)/$(libdir)/pkgconfig  
86 - @$(INSTALL_DATA) $(MODULE_NAME).pc $(DESTDIR)/$(libdir)/pkgconfig 85 + $(MKDIR) $(DESTDIR)/$(libdir)/pkgconfig
  86 + $(INSTALL_DATA) $(MODULE_NAME).pc $(DESTDIR)/$(libdir)/pkgconfig
87 87
88 Debug: \ 88 Debug: \
89 $(BINDBG)/$(LIBNAME) 89 $(BINDBG)/$(LIBNAME)