jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove SWIG_LIB variable from Makefile

Browse source
This commit is contained in:
William S Fulton 2015-08-20 07:34:02 +01:00
commit 7192b1c735
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile.in
View file

@ -21,7 +21,7 @@ FLAGS = -k -s
##################################################################### #####################################################################
SHELL = /bin/sh SHELL = /bin/sh
SWIG_LIB = @swig_lib@ SWIG_LIB_INSTALL = @SWIG_LIB_INSTALL@
BIN_DIR = @bindir@ BIN_DIR = @bindir@
ENABLE_CCACHE = @ENABLE_CCACHE@ ENABLE_CCACHE = @ENABLE_CCACHE@
TARGET_NOEXE= swig TARGET_NOEXE= swig
@ -508,16 +508,16 @@ lib-modules = std
install-lib: install-lib:
@echo "Installing the SWIG library" @echo "Installing the SWIG library"
@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB) @$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB_INSTALL)
@for file in $(srcdir)/Lib/*.i $(srcdir)/Lib/*.swg ; do \ @for file in $(srcdir)/Lib/*.i $(srcdir)/Lib/*.swg ; do \
i=`basename $$file` ; \ i=`basename $$file` ; \
echo "Installing $(DESTDIR)$(SWIG_LIB)/$$i"; \ echo "Installing $(DESTDIR)$(SWIG_LIB_INSTALL)/$$i"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(SWIG_LIB)/$$i; \ $(INSTALL_DATA) $$file $(DESTDIR)$(SWIG_LIB_INSTALL)/$$i; \
done; done;
@for lang in $(lib-languages) $(lib-modules); \ @for lang in $(lib-languages) $(lib-modules); \
do \ do \
echo "Installing language specific files for $$lang"; \ echo "Installing language specific files for $$lang"; \
dst=$(DESTDIR)$(SWIG_LIB)/$$lang; \ dst=$(DESTDIR)$(SWIG_LIB_INSTALL)/$$lang; \
$(MKINSTDIRS) $$dst; \ $(MKINSTDIRS) $$dst; \
(doti="`cd $(srcdir)/Lib/$$lang && ls *.i 2>/dev/null || echo ''`"; \ (doti="`cd $(srcdir)/Lib/$$lang && ls *.i 2>/dev/null || echo ''`"; \
dotswg="`cd $(srcdir)/Lib/$$lang && ls *.swg 2>/dev/null || echo ''`"; \ dotswg="`cd $(srcdir)/Lib/$$lang && ls *.swg 2>/dev/null || echo ''`"; \
@ -552,7 +552,7 @@ uninstall-main:
uninstall-lib: uninstall-lib:
@echo "Uninstalling the SWIG library" @echo "Uninstalling the SWIG library"
rm -rf $(DESTDIR)$(SWIG_LIB)/ rm -rf $(DESTDIR)$(SWIG_LIB_INSTALL)/
uninstall-ccache: uninstall-ccache:
test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) uninstall) test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) uninstall)

3
configure.ac
View file

@ -2912,7 +2912,8 @@ AC_SUBST(ac_aux_dir)
AC_ARG_WITH(swiglibdir,[ --with-swiglibdir=DIR Put SWIG system-independent libraries into DIR.], AC_ARG_WITH(swiglibdir,[ --with-swiglibdir=DIR Put SWIG system-independent libraries into DIR.],
[swig_lib="$withval"], [swig_lib="${datadir}/swig/${PACKAGE_VERSION}"]) [swig_lib="$withval"], [swig_lib="${datadir}/swig/${PACKAGE_VERSION}"])
AC_SUBST(swig_lib) SWIG_LIB_INSTALL=${swig_lib}
AC_SUBST(SWIG_LIB_INSTALL)
AC_DEFINE_DIR(SWIG_LIB, swig_lib, [Directory for SWIG system-independent libraries]) AC_DEFINE_DIR(SWIG_LIB, swig_lib, [Directory for SWIG system-independent libraries])
case $build in case $build in