diff options
Diffstat (limited to 'math/slepc/files')
| -rw-r--r-- | math/slepc/files/patch-config_install.py | 9 | ||||
| -rw-r--r-- | math/slepc/files/patch-makefile | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/math/slepc/files/patch-config_install.py b/math/slepc/files/patch-config_install.py index 374309fdd9b0..b31bde13af62 100644 --- a/math/slepc/files/patch-config_install.py +++ b/math/slepc/files/patch-config_install.py @@ -1,18 +1,21 @@ ---- config/install.py.orig 2018-06-25 08:07:05 UTC +--- config/install.py.orig 2018-10-02 22:50:33 UTC +++ config/install.py -@@ -295,11 +295,11 @@ for dir in dirs: +@@ -311,13 +311,13 @@ for dir in dirs: def installShare(self): self.copies.extend(self.copytree(self.rootShareDir, self.destShareDir)) +- examplesdir=os.path.join(self.destShareDir,'slepc','examples') - if os.path.exists(os.path.join(self.destShareDir,'slepc','examples')): - shutil.rmtree(os.path.join(self.destShareDir,'slepc','examples')) - os.mkdir(os.path.join(self.destShareDir,'slepc','examples')) - self.copyExamples(self.rootDir,os.path.join(self.destShareDir,'slepc','examples')) -- self.fixExamplesMakefile(os.path.join(self.destShareDir,'slepc','examples','makefile')) ++ examplesdir=os.path.join(self.destShareDir,'examples','slepc') + if os.path.exists(os.path.join(self.destShareDir,'examples','slepc')): + shutil.rmtree(os.path.join(self.destShareDir,'examples','slepc')) + os.mkdir(os.path.join(self.destShareDir,'examples','slepc')) + self.copyExamples(self.rootDir,os.path.join(self.destShareDir,'examples','slepc')) + self.copyConfig(self.rootDir,examplesdir) +- self.fixExamplesMakefile(os.path.join(self.destShareDir,'slepc','examples','makefile')) + self.fixExamplesMakefile(os.path.join(self.destShareDir,'examples','slepc','makefile')) return diff --git a/math/slepc/files/patch-makefile b/math/slepc/files/patch-makefile index 645efb523d7c..3221be9ca2db 100644 --- a/math/slepc/files/patch-makefile +++ b/math/slepc/files/patch-makefile @@ -1,11 +1,11 @@ ---- makefile.orig 2018-05-02 15:18:14 UTC +--- makefile.orig 2018-10-02 22:42:08 UTC +++ makefile -@@ -254,7 +254,7 @@ chk_slepc_dir: +@@ -210,7 +210,7 @@ chk_slepc_dir: # Install relevant files in the prefix directory # install: -- -@${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB}; -+ -@${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${FREEBSD_STAGEDIR}${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB}; +- @${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB}; ++ @${PYTHON} ./config/install.py ${SLEPC_DIR} ${PETSC_DIR} ${FREEBSD_STAGEDIR}${SLEPC_DESTDIR} ${PETSC_ARCH} ${AR_LIB_SUFFIX} ${RANLIB}; # ------------------------------------------------------------------ # |