Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 776583
Collapse All | Expand All

(-)a/Makefile.am (-12 / +6 lines)
Lines 456-461 oct-file-pkg-add: $(OCT_FILE_PKG_ADD_FILES) Link Here
456
	cat $(OCT_FILE_PKG_ADD_FILES) > $@-t \
456
	cat $(OCT_FILE_PKG_ADD_FILES) > $@-t \
457
	  && mv $@-t $@
457
	  && mv $@-t $@
458
458
459
SHLIBEXT = @SHLIBEXT@
459
install-oct: oct-file-pkg-add
460
install-oct: oct-file-pkg-add
460
	$(MKDIR_P) $(DESTDIR)$(octfiledir)
461
	$(MKDIR_P) $(DESTDIR)$(octfiledir)
461
	if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \
462
	if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \
Lines 463-480 install-oct: oct-file-pkg-add Link Here
463
	fi
464
	fi
464
	cd $(DESTDIR)$(octlibdir) && \
465
	cd $(DESTDIR)$(octlibdir) && \
465
	for ltlib in $(OCT_FILE_LIBS); do \
466
	for ltlib in $(OCT_FILE_LIBS); do \
466
	  f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
467
	  f_la=$$(basename "$$ltlib"); \
467
	  dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
468
	  f_so="$${f_la%.la}.$(SHLIBEXT)"; \
468
	  if [ -n "$$dl" ]; then \
469
	  f_oct="$${f_la%.la}.oct"; \
469
	    $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
470
	  mv "$$f_so" "$(DESTDIR)$(octfiledir)/$${f_oct}"; \
470
	  else \
471
	  rm -f "$$f_la"; \
471
	    echo "error: dlname is empty in $$ltlib!"; \
472
	    exit 1; \
473
	  fi; \
474
	  lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \
475
	  if [ -n "$$lnames" ]; then \
476
	    rm -f $$f $$lnames $$dl; \
477
	  fi \
478
	done
472
	done
479
.PHONY: install-oct
473
.PHONY: install-oct
480
474
(-)a/configure.ac (-1 / +7 lines)
Lines 3096-3101 AC_SUBST(AUTOCONF_SUBST_VARS) Link Here
3096
AC_SUBST(ac_config_files)
3096
AC_SUBST(ac_config_files)
3097
AC_SUBST(ac_config_headers)
3097
AC_SUBST(ac_config_headers)
3098
3098
3099
# This macro from m4/lib-link.m4 sets the $acl_shlibext variable to
3100
# the shared library extension on this system. This allows us to avoid
3101
# spelunking through installed libtool archive files to determine it
3102
# at install-time (in the install-oct target).
3103
AC_LIB_RPATH
3104
AC_SUBST(SHLIBEXT, "${acl_shlibext}")
3105
3099
AC_CONFIG_FILES([
3106
AC_CONFIG_FILES([
3100
  Makefile
3107
  Makefile
3101
  build-aux/check-subst-vars.sh:build-aux/check-subst-vars.in.sh
3108
  build-aux/check-subst-vars.sh:build-aux/check-subst-vars.in.sh
3102
- 

Return to bug 776583