Rev 2 | Rev 7 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2 | Rev 3 | ||
|---|---|---|---|
| Line 1... | Line 1... | ||
| 1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
| 2 | ## 01_master.in.dpatch by <magnus@proffe.kibibyte.se> |
2 | ## 01_master.in.dpatch by <magnus@kibibyte.se> |
| 3 | ## |
3 | ## |
| 4 | ## All lines beginning with `## DP:' are a description of the patch. |
4 | ## All lines beginning with `## DP:' are a description of the patch. |
| 5 | ## DP: Add local site-pike directories to master.pike.in |
5 | ## DP: Add local site-pike directories to master.pike.in |
| 6 | 6 | ||
| 7 | @DPATCH@ |
7 | @DPATCH@ |
| 8 | - | ||
| 9 | diff -U3 -Narp pike7.6-7.6.24/lib/master.pike.in pike7.6-7.6.24.new/lib/master.pike.in |
8 | diff -urNad trunk~/lib/master.pike.in trunk/lib/master.pike.in |
| 10 | --- pike7.6-7.6.24/lib/master.pike.in 2004-07-23 14:17:24 +0200 |
9 | --- trunk~/lib/master.pike.in 2007-01-01 01:28:04.000000000 +0100 |
| 11 | +++ pike7.6-7.6.24.new/lib/master.pike.in 2005-01-06 23:27:54 +0100 |
10 | +++ trunk/lib/master.pike.in 2007-09-26 09:26:21.000000000 +0200 |
| 12 | @@ -565,6 +565,14 @@ string normalize_path( string path ) |
11 | @@ -1115,6 +1115,14 @@ |
| 13 | #else |
- | |
| 14 | return replace(path,"\\","/"); |
12 | include_prefix = "¤include_prefix¤"; |
| 15 | #endif |
13 | #endif |
| - | 14 | system_module_path=pike_module_path; |
|
| 16 | + |
15 | + |
| 17 | + // Debian paths |
16 | + // Debian paths |
| 18 | + add_include_path("/usr/local/include/pike");
|
17 | + add_include_path("/usr/local/include/pike");
|
| 19 | + add_include_path("/usr/local/include/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__);
|
18 | + add_include_path("/usr/local/include/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__);
|
| 20 | + add_module_path("/usr/local/lib/pike/site_pike");
|
19 | + add_module_path("/usr/local/lib/pike/site_pike");
|
| 21 | + add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
|
20 | + add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
|
| 22 | + add_module_path("/usr/local/share/pike/site_pike");
|
21 | + add_module_path("/usr/local/share/pike/site_pike");
|
| 23 | + add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
|
22 | + add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
|
| 24 | } |
23 | } |
| 25 | 24 | ||
| 26 | //! Mapping containing the cache of currently compiled files. |
- | |
| - | 25 | ||