diff options
| author | Matěj Cepl <mcepl@cepl.eu> | 2005-04-30 17:57:00 +0200 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2015-01-03 10:34:50 +0100 |
| commit | 4c6607a67fa1da57b4a885594bf28c9450afb4dc (patch) | |
| tree | 25d8236371cf7ee0280109ebd2a5995da45faeea /wlp/module/Makefile.pre.in | |
| parent | 59eda1d0150e4b517a071c1e04ded96ff8f0f314 (diff) | |
| download | pygn-4c6607a67fa1da57b4a885594bf28c9450afb4dc.tar.gz | |
pyg 0.9.6-4 from archive.debian.org0.9.6-4
Diffstat (limited to 'wlp/module/Makefile.pre.in')
| -rw-r--r-- | wlp/module/Makefile.pre.in | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/wlp/module/Makefile.pre.in b/wlp/module/Makefile.pre.in index 8279573..a30609e 100644 --- a/wlp/module/Makefile.pre.in +++ b/wlp/module/Makefile.pre.in @@ -17,7 +17,11 @@ # only withs with Python 1.5, alpha 3 or newer.) # Create a file Setup.in for your extension. This file follows the +<<<<<<< HEAD # format of the Modules/Setup.in file; see the instructions there. +======= +# format of the Modules/Setup.dist file; see the instructions there. +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org # For a simple module called "spam" on file "spammodule.c", it can # contain a single line: # spam spammodule.c @@ -128,7 +132,11 @@ SO= @SO@ LDSHARED= @LDSHARED@ CCSHARED= @CCSHARED@ LINKFORSHARED= @LINKFORSHARED@ +<<<<<<< HEAD #@SET_CCC@ +======= +CXX= @CXX@ +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org # Install prefix for architecture-independent files prefix= /usr/local @@ -148,7 +156,11 @@ SHELL= /bin/sh # Expanded directories BINDIR= $(exec_installdir)/bin LIBDIR= $(exec_prefix)/lib +<<<<<<< HEAD MANDIR= $(installdir)/man +======= +MANDIR= $(installdir)/share/man +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org INCLUDEDIR= $(installdir)/include SCRIPTDIR= $(prefix)/lib @@ -164,11 +176,19 @@ LIBPL= $(LIBP)/config PYTHONLIBS= $(LIBPL)/libpython$(VERSION).a +<<<<<<< HEAD MAKESETUP= ./makesetup MAKEFILE= $(LIBPL)/Makefile CONFIGC= $(LIBPL)/config.c CONFIGCIN= $(LIBPL)/config.c.in SETUP= $(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup +======= +MAKESETUP= $(LIBPL)/makesetup +MAKEFILE= $(LIBPL)/Makefile +CONFIGC= $(LIBPL)/config.c +CONFIGCIN= $(LIBPL)/config.c.in +SETUP= $(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org SYSLIBS= $(LIBM) $(LIBC) @@ -251,7 +271,11 @@ sedscript: $(MAKEFILE) -e '2s%.*%# $H%p' \ -e '/^VERSION=/s/^VERSION=[ ]*\(.*\)/s%@VERSION[@]%\1%/p' \ -e '/^CC=/s/^CC=[ ]*\(.*\)/s%@CC[@]%\1%/p' \ +<<<<<<< HEAD -e '/^CCC=/s/^CCC=[ ]*\(.*\)/s%#@SET_CCC[@]%CCC=\1%/p' \ +======= + -e '/^CXX=/s/^CXX=[ ]*\(.*\)/s%@CXX[@]%\1%/p' \ +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org -e '/^LINKCC=/s/^LINKCC=[ ]*\(.*\)/s%@LINKCC[@]%\1%/p' \ -e '/^OPT=/s/^OPT=[ ]*\(.*\)/s%@OPT[@]%\1%/p' \ -e '/^LDFLAGS=/s/^LDFLAGS=[ ]*\(.*\)/s%@LDFLAGS[@]%\1%/p' \ @@ -270,7 +294,10 @@ sedscript: $(MAKEFILE) -e '/^$P=/s/^$P=\(.*\)/s%^$P=.*%$P=\1%/p' \ -e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \ $(MAKEFILE) >sedscript +<<<<<<< HEAD echo "/^#@SET_CCC@/d" >>sedscript +======= +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org echo "/^installdir=/s%=.*%= $(installdir)%" >>sedscript echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript echo "/^srcdir=/s%=.*%= $(srcdir)%" >>sedscript @@ -278,6 +305,15 @@ sedscript: $(MAKEFILE) echo "/^LINKPATH=/s%=.*%= $(LINKPATH)%" >>sedscript echo "/^BASELIB=/s%=.*%= $(BASELIB)%" >>sedscript echo "/^BASESETUP=/s%=.*%= $(BASESETUP)%" >>sedscript +<<<<<<< HEAD +======= + if grep 's%@DEFS' sedscript >/dev/null 2>&1; then \ + :; \ + else \ + echo "s%@DEFS[@]%%" >>sedscript; \ + fi + +>>>>>>> 32401d9... pyg 0.9.6-4 from archive.debian.org # Bootstrap target boot: clobber |