Created
August 14, 2013 09:02
-
-
Save mcs07/6229210 to your computer and use it in GitHub Desktop.
A patch for the gocr makefile so `make libs` works properly.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Makefile.in b/src/Makefile.in | |
index bf4181f..883fec2 | |
--- a/src/Makefile.in | |
+++ b/src/Makefile.in | |
@@ -10,7 +10,7 @@ PROGRAM = gocr$(EXEEXT) | |
PGMASCLIB = Pgm2asc | |
#LIBPGMASCLIB = lib$(PGMASCLIB).a | |
# ToDo: need a better pgm2asc.h for lib users | |
-#INCLUDEFILES = gocr.h | |
+INCLUDEFILES = pgm2asc.h output.h list.h unicode.h gocr.h pnm.h | |
# avoid german compiler messages | |
LANG=C | |
@@ -39,8 +39,8 @@ LIBOBJS=pgm2asc.o \ | |
#VPATH = @srcdir@ | |
bindir = @bindir@ | |
# lib removed for simplification | |
-#libdir = @libdir@ | |
-#includedir = @includedir@ | |
+libdir = @libdir@ | |
+includedir = /include/gocr | |
CC=@CC@ | |
# lib removed for simplification | |
@@ -89,7 +89,8 @@ $(PROGRAM): $(LIBOBJS) gocr.o | |
$(CC) -o $@ $(LDFLAGS) gocr.o $(LIBOBJS) $(LIBS) | |
# if test -r $(PROGRAM); then cp $@ ../bin; fi | |
-libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@[email protected] | |
+#libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@[email protected] | |
+libs: lib$(PGMASCLIB).a | |
#lib$(PGMASCLIB).@[email protected]: $(LIBOBJS) | |
# $(CC) -fPIC -shared -Wl,-h$@ -o $@ $(LIBOBJS) | |
@@ -109,17 +110,17 @@ $(LIBOBJS): Makefile | |
# PHONY = don't look at file clean, -rm = start rm and ignore errors | |
.PHONY : clean proper install uninstall | |
install: all | |
- #$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) | |
- $(INSTALL) -d $(DESTDIR)$(bindir) | |
+ $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) | |
+ #$(INSTALL) -d $(DESTDIR)$(bindir) | |
$(INSTALL) $(PROGRAM) $(DESTDIR)$(bindir) | |
$(INSTALL) ../bin/gocr.tcl $(DESTDIR)$(bindir) # better X11/bin? | |
if test -f lib$(PGMASCLIB).a; then\ | |
$(INSTALL) lib$(PGMASCLIB).a $(DESTDIR)$(libdir);\ | |
$(INSTALL) lib$(PGMASCLIB).@[email protected] $(DESTDIR)$(libdir);\ | |
$(INSTALL) lib$(PGMASCLIB).so $(DESTDIR)$(libdir);\ | |
+ $(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir);\ | |
+ $(INSTALL) ../include/config.h $(DESTDIR)$(includedir);\ | |
fi | |
- # ToDo: not sure that the link will be installed correctly | |
- #$(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir) | |
# directories are not removed | |
uninstall: | |
@@ -129,7 +130,8 @@ uninstall: | |
-rm -f $(DESTDIR)$(libdir)/lib$(PGMASCLIB).@[email protected] | |
-rm -f $(DESTDIR)$(libdir)/lib$(PGMASCLIB).so | |
# ToDo: set to old version.so ? | |
- #for X in $(INCLUDEFILES); do rm -f $(DESTDIR)$(includedir)/$$X; done | |
+ for X in $(INCLUDEFILES); do rm -f $(DESTDIR)$(includedir)/$$X; done | |
+ -rm -f $(DESTDIR)$(includedir)/config.h | |
clean: | |
-rm -f *.o *~ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment