[patch] edbrowse-3.4.5-fix-makefile.patch

edbrowse-3.4.5-fix-makefile.patch (text/plain), 2.25 KB, created by Christopher Brannon (RETIRED) on 2010-12-30 20:23:36 UTC

diff -Naur edbrowse-3.4.5/src/makefile edbrowse-3.4.5-new/src/makefile
--- edbrowse-3.4.5/src/makefile	2010-07-07 16:55:02.000000000 +0000
+++ edbrowse-3.4.5-new/src/makefile	2010-12-30 18:35:25.000000000 +0000
@@ -1,5 +1,8 @@
 #  This is the makefile for edbrowse.
 
+prefix = /usr/local
+bindir = $(prefix)/bin
+
 #  Flags for gcc compilation.
 #  Note, some have reported seg-faults with this program when -O is used.
 #  This is a problem with gcc version 2.95 or less.
@@ -20,7 +23,10 @@
 STRIP=-s
 endif
 
-CFLAGS = -I/usr/local/js/src -I/usr/local/js/src/Linux_All_DBG.OBJ -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS)
+JSFLAGS = -I/usr/include/js -DXP_UNIX
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(JSFLAGS) -c -o $@ $<
 
 #  If the smjs library is already installed by your linux distribution,
 #  e.g. Debian, use the following flags.
@@ -42,7 +48,7 @@
 #  Or you can use the target jslink below.
 #  Some folks need to add -lcrypto to this list.
 
-LIBS = -lpcre -lm -lssl -lsmjs -lcurl -lreadline
+LIBS = -lpcre -lm -lssl -ljs -lcurl -lreadline
 
 #  Make the dynamically linked executable program by default.
 #  Edbrowse executable.
@@ -56,19 +62,16 @@
 $(EBOBJS) : eb.h eb.p messages.h tcp.h
 
 edbrowse: $(EBOBJS) tcp.o dbstubs.o
-	cc $(LFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS)
+	$(CC) $(LDFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS)
 
 #  You probably need to be root to do this.
 install:
-	install edbrowse /usr/local/bin
+	install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
 
 #  If you had to build the javascript library yourself,
 #  link it into /usr/lib.
 #  If it's already there, do nothing.
 #  This has to be done as root.
-jslink:
-	[ -f /usr/lib/libsmjs.so ] || ln -s /usr/local/js/src/Linux_All_DBG.OBJ/libjs.so /usr/lib/libsmjs.so
-	[ -f /usr/lib/libsmjs.a ] || ln -s /usr/local/js/src/Linux_All_DBG.OBJ/libjs.a /usr/lib/libsmjs.a
 
 dbinfx.o : dbinfx.ec
 	esql -c dbinfx.ec
@@ -79,7 +82,7 @@
 	esql $(ESQLDFLAGS) -o edbrowseinf $(EBOBJS) tcp.o dbops.o dbinfx.o $(LIBS)
 
 edbrowseodbc: $(EBOBJS) tcp.o dbops.o dbodbc.o
-	cc $(LFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc
+	$(CC) $(LDFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc
 
 #  Build function prototypes.
 #  mkproto is my program, not a general unix utility.