From 1d98481ac33aece77c713986eb692e765ca08944 Mon Sep 17 00:00:00 2001 From: Fabrizio Riguzzi Date: Wed, 15 Oct 2014 15:15:24 +0200 Subject: [PATCH] fixed compilation problems --- packages/cplint/Makefile.in | 13 +++++++------ packages/cplint/configure.in | 2 +- packages/cplint/slipcase/Makefile.in | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/cplint/Makefile.in b/packages/cplint/Makefile.in index 61991acf0..08cece659 100644 --- a/packages/cplint/Makefile.in +++ b/packages/cplint/Makefile.in @@ -41,8 +41,8 @@ CPLINT_LIBS=@CPLINT_LIBS@ #4.1VPATH=@srcdir@:@srcdir@/OPTYap CWD=$(PWD) # -OBJS=cplint_yap.o cplint_Prob.o -SOBJS=cplint.@SHLIB_SUFFIX@ +OBJS=cplint_yap.o cplint_Prob.o +SOBJS=cplint.@SHLIB_SUFFIX@ @@ -148,7 +148,9 @@ CPLINT_LEARNING_PROGRAMS=\ $(CPLINT_SRCDIR)/em \ $(CPLINT_SRCDIR)/rib \ $(CPLINT_SRCDIR)/slipcase \ - $(CPLINT_SRCDIR)/slipcover + $(CPLINT_SRCDIR)/slipcover \ + $(CPLINT_SRCDIR)/lemur + all: $(SOBJS) @@ -167,7 +169,7 @@ cplint_Prob.o: $(srcdir)/cplint_Prob.c $(srcdir)/cplint.h clean: rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK -install: all install-examples +install: all mkdir -p $(DESTDIR)$(SHAREDIR)/cplint mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/examples mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/doc @@ -183,9 +185,8 @@ install: all install-examples cp $(CPLINT_SRCDIR)/rib/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ cp $(CPLINT_SRCDIR)/slipcase/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ cp $(CPLINT_SRCDIR)/slipcover/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ - $(INSTALL_PROGRAM) slipcase/bddem.so $(DESTDIR)$(YAPLIBDIR) + cp $(CPLINT_SRCDIR)/lemur/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ -install_examples: installcheck: for h in ${CPLINT_TEST_PROGRAMS}; do echo "t. halt." | $(BINDIR)/yap -l $$h; done diff --git a/packages/cplint/configure.in b/packages/cplint/configure.in index e3b4f73ce..ebdb4b1ca 100644 --- a/packages/cplint/configure.in +++ b/packages/cplint/configure.in @@ -27,7 +27,7 @@ if test ! "$yap_cv_cplint" = "no" CPLINT_SHLIB_LD=$SHLIB_LD SHLIB_SUFFIX="so" fi - PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs" + PKG_CPLINT="packages/cplint packages/cplint/slipcase packages/cplint/approx/simplecuddLPADs" AC_SUBST(CPLINT_LIBS) AC_SUBST(CPLINT_CFLAGS) AC_SUBST(CPLINT_LDFLAGS) diff --git a/packages/cplint/slipcase/Makefile.in b/packages/cplint/slipcase/Makefile.in index ca1258124..6d7b71c8b 100644 --- a/packages/cplint/slipcase/Makefile.in +++ b/packages/cplint/slipcase/Makefile.in @@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin # where YAP should look for libraries # LIBDIR=@libdir@/Yap -DESTDIR=$(prefix)/share/Yap +DESTDIR=$(prefix)/lib/Yap # # CC=@CC@