File: 23_octavesystemdirs.diff

package info (click to toggle)
pfstools 2.2.0-10
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 3,548 kB
  • sloc: cpp: 26,364; javascript: 3,814; ansic: 999; sh: 180; python: 65; makefile: 47
file content (20 lines) | stat: -rw-r--r-- 1,008 bytes parent folder | download | duplicates (5)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Description: Octave: Use system directories instead of local, site-specific
 ones.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Forwarded: no

--- pfstools-2.0.5.orig/CMakeLists.txt
+++ pfstools-2.0.5/CMakeLists.txt
@@ -284,9 +284,9 @@ if( OCTAVE_DEST_DIR )
   set( OCTAVE_OCT_DIR ${OCTAVE_DEST_DIR} )
   set( OCTAVE_M_DIR ${OCTAVE_DEST_DIR} )
 else( OCTAVE_DEST_DIR )
- execute_process(COMMAND octave-config --oct-site-dir OUTPUT_VARIABLE OCTAVE_OCT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND octave-config --print LOCALOCTFILEDIR OUTPUT_VARIABLE OCTAVE_OCT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
  set( OCTAVE_OCT_DIR "${OCTAVE_OCT_DIR}/pfstools" )
- execute_process(COMMAND octave-config --m-site-dir OUTPUT_VARIABLE OCTAVE_M_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND octave-config --print LOCALFCNFILEDIR OUTPUT_VARIABLE OCTAVE_M_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
  set( OCTAVE_M_DIR "${OCTAVE_M_DIR}/pfstools" )
 endif( OCTAVE_DEST_DIR )