diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad library order

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-01-15 01:02:24 +00:00
parent ff628b8e78
commit d93b24920d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/plunit/Makefile.in
View File

@ -17,14 +17,16 @@ EROOTDIR = @exec_prefix@
srcdir=@srcdir@ srcdir=@srcdir@
BINDIR = $(EROOTDIR)/bin BINDIR = $(EROOTDIR)/bin
LIBDIR=$(EROOTDIR)/lib
SHAREDIR=$(EROOTDIR)/share/Yap
YAPLIBDIR=$(EROOTDIR)/lib/Yap YAPLIBDIR=$(EROOTDIR)/lib/Yap
# hack for SWI compatibility
LIBDIR=$(EROOTDIR)/share/Yap
PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
LN_S=@LN_S@ LN_S=@LN_S@
EXDIR=$(LIBDIR)/examples/plunit EXDIR=$(LIBDIR)/examples/plunit
INSTALLDIR=$(SHAREDIR)
else # SWI else # SWI
srcdir=. srcdir=.
@ -38,6 +40,8 @@ PCEHOME=../xpce
LIBDIR=$(PLBASE)/library LIBDIR=$(PLBASE)/library
EXDIR=$(PKGDOC)/examples/plunit EXDIR=$(PKGDOC)/examples/plunit
INSTALLDIR=$(LIBDIR)
endif endif
DESTDIR= DESTDIR=
@ -63,15 +67,15 @@ all:
@echo "Nothing to do for this package" @echo "Nothing to do for this package"
install: $(LIBPL) install: $(LIBPL)
mkdir -p $(DESTDIR)$(LIBDIR) mkdir -p $(DESTDIR)$(INSTALLDIR)
$(INSTALL_DATA) $(LIBALL) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) $(LIBALL) $(DESTDIR)$(INSTALLDIR)
$(PL) -f none -g make -t halt $(PL) -f none -g make -t halt
ln-install: $(LIBPL) ln-install: $(LIBPL)
mkdir -p $(DESTDIR)$(LIBDIR) mkdir -p $(DESTDIR)$(INSTALLDIR)
for f in $(LIBALL); do \ for f in $(LIBALL); do \
rm -f $(DESTDIR)$(LIBDIR)/$$f; \ rm -f $(DESTDIR)$(INSTALLDIR)/$$f; \
ln -s `pwd`/$$f $(DESTDIR)$(LIBDIR); \ ln -s `pwd`/$$f $(DESTDIR)$(INSTALLDIR); \
done done
$(PL) -f none -g make -t halt $(PL) -f none -g make -t halt
@ -88,7 +92,7 @@ install-examples::
(cd examples && $(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(EXDIR)) (cd examples && $(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(EXDIR))
uninstall:: uninstall::
rm -f $(LIBDIR)/plunit.pl rm -f $(DESTDIR)$(INSTALLDIR)/plunit.pl
$(PL) -f none -g make -t halt $(PL) -f none -g make -t halt
check:: check::