diff options
Diffstat (limited to 'wlp')
| -rw-r--r-- | wlp/module/Makefile.pre.in | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/wlp/module/Makefile.pre.in b/wlp/module/Makefile.pre.in index a30609e..05f108b 100644 --- a/wlp/module/Makefile.pre.in +++ b/wlp/module/Makefile.pre.in @@ -17,11 +17,7 @@ # 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 @@ -132,11 +128,7 @@ 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 @@ -156,11 +148,7 @@ 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 @@ -176,19 +164,11 @@ 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) @@ -271,11 +251,7 @@ 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' \ @@ -294,10 +270,6 @@ 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 @@ -305,15 +277,12 @@ 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 |