fixes Makefile in prank so lib dir is not hardcoded

etetoolkit · Jan 16, 2016 · e2fc97e · e2fc97e
1 parent 525a031
commit e2fc97e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/compile_all.py b/compile_all.py
@@ -95,6 +95,7 @@ def compile_prank():
     rm -rf %(BINDIR)s/prank;
     cd %(SRCDIR)s/prank-100802/;
     make clean;
+    rm prank
     make -j %(CORES)s; 
     cp prank %(BINDIR)s/; 
     ls %(BINDIR)s/prank; 
@@ -304,13 +305,16 @@ def system(cmd):
     return os.system(cmd)
 
 def _main():
-    global ARGS
+    global ARGS, DEBUG
     parser = ArgumentParser()
     parser.add_argument("-v", dest="verbose", action="store_true")
     parser.add_argument("--debug", dest="debug", action="store_true")
     parser.add_argument(dest="targets", nargs="*")
 
     ARGS = parser.parse_args()
+    if ARGS.debug:
+        DEBUG = True
+
     errors = compile_all(targets=ARGS.targets, verbose=ARGS.verbose)
     #if errors:
     #    sys.exit(-1)

diff --git a/src/prank-100802/Makefile b/src/prank-100802/Makefile
@@ -4,9 +4,10 @@ CC            = gcc
 CXX           = g++
 CFLAGS        = -pipe -O2
 CXXFLAGS      = -pipe -O2
-INCPATH       = -I/usr/include -I.
+#INCPATH       = -I/usr/include -I.
+INCPATH       = -I.
 LINK          = g++
-LIBS          = -L/usr/lib
+#LIBS          = -L/usr/lib
 DEL_FILE      = rm -f
 
 ####### Output directory

diff --git a/src/prank-100802/prank b/src/prank-100802/prank