Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 113 → Rev 112

/trunk/debian/changelog
1,13 → 1,3
pike7.8 (7.8.352-dfsg-3) unstable; urgency=low
 
* Revert cflags.dpatch (which was actually never applied). Stripping the
last component was no mistake; pike -x cflags is only meant to be used
by new-style modules.
* Change include_prefix to /usr/include/pike7.8/pike so that building
new-style modules can work.
 
-- Magnus Holmgren <holmgren@debian.org> Fri, 30 Jul 2010 16:28:16 +0200
 
pike7.8 (7.8.352-dfsg-2) unstable; urgency=low
 
* Add trigger for dumping of Pike modules when pike7.8-core or any
/trunk/debian/rules
126,7 → 126,7
--disable-smartlink_binary \
$(MACHINE_OPTS) $(EXTRA_ARGS)
 
include_prefix=/usr/include/pike$(PIKEV)/pike
include_prefix=/usr/include/pike$(PIKEV)
lib_prefix=/usr/lib/pike$(PIKEV)
 
MODULE_PACKAGES=$(shell dh_listpackages -a -N $(PIKE)-core)
/trunk/debian/patches/cflags.dpatch
0,0 → 1,19
#! /bin/sh /usr/share/dpatch/dpatch-run
## cflags.dpatch by Magnus Holmgren <holmgren@debian.org>
##
## DP: Don't remove the last component from include_prefix before using it in cflags
 
@DPATCH@
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/master.pike.in trunk/lib/master.pike.in
--- trunk~/lib/master.pike.in 2009-09-19 12:08:35.000000000 +0200
+++ trunk/lib/master.pike.in 2010-07-30 12:29:48.000000000 +0200
@@ -2104,7 +2104,7 @@
#if "#include_prefix#"[0]!='#'
include_prefix = "#include_prefix#";
- cflags = (cflags || "") + " -I" + dirname(include_prefix);
+ cflags = (cflags || "") + " -I" + include_prefix;
#endif
#if "#doc_prefix#"[0]!='#'