diff options
Diffstat (limited to 'Library/Formula/gocr.rb')
| -rw-r--r-- | Library/Formula/gocr.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Formula/gocr.rb b/Library/Formula/gocr.rb index 8a3a7ca03..8eea241f1 100644 --- a/Library/Formula/gocr.rb +++ b/Library/Formula/gocr.rb @@ -11,7 +11,7 @@ class Gocr < Formula # Edit makefile to install libs per developer documentation def patches - DATA if build.include? 'with-lib' + DATA if build.with? "lib" end def install @@ -24,7 +24,7 @@ class Gocr < Formula s.change_make_var! 'mandir', '/share/man' end - system "make libs" if build.include? 'with-lib' + system "make libs" if build.with? "lib" system "make install" end @@ -41,12 +41,12 @@ index bf4181f..883fec2 @@ -10,7 +10,7 @@ PROGRAM = gocr$(EXEEXT) PGMASCLIB = Pgm2asc #LIBPGMASCLIB = lib$(PGMASCLIB).a - # ToDo: need a better pgm2asc.h for lib users + # 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@ @@ -55,17 +55,17 @@ index bf4181f..883fec2 -#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).@PACKAGE_VERSION@.so +#libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@PACKAGE_VERSION@.so +libs: lib$(PGMASCLIB).a - + #lib$(PGMASCLIB).@PACKAGE_VERSION@.so: $(LIBOBJS) # $(CC) -fPIC -shared -Wl,-h$@ -o $@ $(LIBOBJS) @@ -109,17 +110,17 @@ $(LIBOBJS): Makefile @@ -87,7 +87,7 @@ index bf4181f..883fec2 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: @@ -97,6 +97,6 @@ index bf4181f..883fec2 - #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 *~ |