--- ./apps/group/src/Makefile.inc.orig	2011-04-11 10:17:49.000000000 -0600
+++ ./apps/group/src/Makefile.inc	2013-02-27 15:10:34.341168779 -0700
@@ -1,4 +1,4 @@
-  ExtraCXXFLAGS = -I$(ProjectTop)/external/permlib/include
+  ExtraCXXFLAGS = -I/usr/include/permlib
 
 # Local Variables:
 # mode: Makefile
--- ./apps/polytope/src/Makefile.inc.orig	2012-01-13 15:32:36.000000000 -0700
+++ ./apps/polytope/src/Makefile.inc	2013-02-27 15:10:34.340168780 -0700
@@ -1,17 +1,12 @@
 ifndef ExtensionTop
-  ExternalLibs := cdd lrs sympol
-
-  lrs_interface$O : ExtraCXXFLAGS = -I$(ProjectTop)/external/lrs
-  cdd_interface$O : ExtraCXXFLAGS = -I$(ProjectTop)/external/cdd/lib-src-gmp $(call addinclude, $(ProjectTop)/ext_lib/cdd/globals_gmp.h)
-  cdd_float_interface$O : ExtraCXXFLAGS = -I$(ProjectTop)/external/cdd/lib-src
-
-  ExtraCXXFLAGS += -I$(ProjectTop)/external/permlib/include
-  sympol_interface$O : ExtraCXXFLAGS += -I$(ProjectTop)/external/sympol
+  lrs_interface$O : ExtraCXXFLAGS = -I/usr/include/lrslib
+  cdd_interface$O : ExtraCXXFLAGS = -I/usr/include/cddlib $(call addinclude, $(ProjectTop)/ext_lib/cdd/globals_gmp.h)
+  cdd_float_interface$O : ExtraCXXFLAGS = -I/usr/include/cddlib
 
-  LIBS += $(BuildDir)/external/lrs/liblrsgmp$A $(BuildDir)/external/cdd/libcddgmp$A $(BuildDir)/external/cdd/libcdd$A $(BuildDir)/external/sympol/libsympol$A 
+  LIBS += -llrsgmp -lcddgmp -lcdd -lsympol
 endif
 
-ifneq ($(filter 4.4% 4.5%,${GCCversion}),)
+ifneq ($(filter 4.4% 4.5% 4.6% 4.7% 4.8%,${GCCversion}),)
   core_point_algo$O rel_int_point$O pointed_part$O : ExtraCXXFLAGS += -fno-strict-aliasing
 endif
 
--- ./perl/polymake-config.orig	2011-05-30 16:51:45.000000000 -0600
+++ ./perl/polymake-config	2013-02-27 15:14:32.177979991 -0700
@@ -126,9 +126,6 @@ while (defined ($_=shift)) {
 
    } elsif ($_ eq "--ldflags") {
       my $ldflags=$conf{LDflags};
-      if ($ldflags !~ /(?:^|\s)-L$conf{InstallLib}(?:\s|$)/) {
-         $ldflags="-L$conf{InstallLib} $ldflags";
-      }
       my $add_rpath=1;
       open CF, ">$tmpfile.cc" or die "can't create temporary file $tmpfile.cc: $!\n";
       print CF "int main() { return 0; }\n";
@@ -146,8 +143,6 @@ while (defined ($_=shift)) {
       close CC;
       if ($^O eq "darwin") {
          $ldflags="$conf{ARCHFLAGS} $ldflags";
-      } elsif ($add_rpath) {
-         $ldflags.=" -Wl,-rpath,$conf{InstallLib}";
       }
       $ldflags=~s/^\s+//; $ldflags=~s/\s+$//; $ldflags=~s/\s{2,}/ /g;
       if ($debug_asked=defined($debug)) {
--- ./support/corelib.make.orig	2012-03-02 15:37:49.000000000 -0700
+++ ./support/corelib.make	2013-02-27 15:10:34.340168780 -0700
@@ -90,7 +90,9 @@ ${CoreLib} : ${SharedObjects} ${Standalo
 ifneq (${LDcallableFlags},none)
   # no explicit dependence on XSObjects here because they are built in compile-xs using the Makefile generated by xsubpp
   ${CallableLib} : ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} $(patsubst %,${SourceDir}/perl/%.xs,${XSModules})
-	${CXX} ${LDcallableFlags} -o $@ ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LDFLAGS} ${PERLccdlflags} -lmpfr -lgmp ${LIBXML2_LIBS} ${LIBS} -L${PERLarchlib}/CORE -lperl
+	${CXX} ${LDcallableFlags} -o ${PerlExtDir}/libpolymake.so.@VERSION@ ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LDFLAGS} ${PERLccdlflags} -Wl,-h,libpolymake.so.@MAJVER@ -lmpfr -lgmp ${LIBXML2_LIBS} ${LIBS} -L${PERLarchlib}/CORE -lperl
+	ln -s libpolymake.so.@VERSION@ ${PerlExtDir}/libpolymake.so.@MAJVER@
+	ln -s libpolymake.so.@MAJVER@ $@
 else
   ${CallableLib} : ${GlueObjects} ${XXSObjects} $(patsubst %,${SourceDir}/perl/%.xs,${XSModules})
 endif
--- ./support/configure.pl.orig	2012-03-02 02:26:14.000000000 -0700
+++ ./support/configure.pl	2013-02-27 15:10:34.340168780 -0700
@@ -488,10 +488,6 @@ if (defined $GMP) {
    $CXXflags .= " -I$GMP/include";
    my $libdir=get_libdir($GMP, "gmp");
    $LDflags .= " -L$libdir";
-   if ( !$WithFink && exists $options{gmp}) {  # this does not work for Mac OS 10.4
-      # non-standard location
-      $LDflags .= " -Wl,-rpath,$libdir";
-   }
 }
 
 my $MPFR=$options{mpfr};
@@ -500,10 +496,6 @@ if (defined($MPFR) && $MPFR ne $GMP) {
    $CXXflags .= " -I$MPFR/include";
    my $libdir=get_libdir($MPFR, "mpfr");
    $LDflags .= " -L$libdir";
-   if ( !$WithFink ) {  # this does not work for Mac OS 10.4
-      # non-standard location
-      $LDflags .= " -Wl,-rpath,$libdir";
-   }
 }
 
 my $BOOST=$options{boost};