Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 156 → Rev 157

/trunk/debian/patches/module-layout.patch
8,8 → 8,8
#endif
+ // Debian paths
+ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules");
+ add_include_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/include");
+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules");
+
#if "#cflags# "[0]!='#'
cflags = "#cflags#";
24,7 → 24,7
-// master() puts the lib/modules path last.
-string system_module_path=master()->system_module_path[-1];
+
+string system_module_path="/usr/local/lib/pike"+__REAL_VERSION__+"/modules";
+string system_module_path="/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules";
// where do we install the documentation?
string system_doc_path = master()->doc_prefix;
/trunk/debian/changelog
1,8 → 1,11
pike7.8 (7.8.700-2) unstable; urgency=low
 
* Upload to unstable.
* module-layout.patch: Use __REAL_MAJOR__ and __REAL_MINOR__ in
version-specific include and module paths; __REAL_VERSION__, being a
float, could allegedly cause trouble.
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 07 May 2013 22:22:05 +0200
-- Magnus Holmgren <holmgren@debian.org> Tue, 07 May 2013 23:08:25 +0200
 
pike7.8 (7.8.700-1) experimental; urgency=low