Opened 11 years ago
Closed 11 years ago
#202 closed defect (fixed)
Fix makefile issues from 1.5
| Reported by: | MatthewWhiting | Owned by: | MatthewWhiting |
|---|---|---|---|
| Priority: | normal | Milestone: | Release-1.6 |
| Component: | Building/Installation | Version: | 1.5 |
| Severity: | normal | Keywords: | |
| Cc: |
Description
A couple of issues cropped up in the Makefile/installation for v1.5. Importantly, this bit:
install :
$(INSTALL) -d -m 2755 $(INSTALLDIR)
$(INSTALL) -m 755 $(EXEC) $(INSTALLDIR)
$(RM) $(INSTALLDIR)/$(EXEC-STUB)
cd $(INSTALLDIR) && $(LN_S) $(EXEC) $(EXEC-STUB)
-test ! -f $(LIB) || $(INSTALL) -d -m 2755 $(LIBDIR)
-test ! -f $(LIB) || $(INSTALL) -m 644 $(LIB) $(LIBDIR)
-test ! -f $(LIB) || cd $(LIBDIR) && $(RM) $(LIB_LN) && $(LN_S) $(LIB) $(LIB_LN)
-test ! -f $(LIBSO) || $(INSTALL) -m 755 $(LIBSO) $(LIBDIR) && \
if [ "" != "" ] ; then \
cd $(LIBDIR) && $(RM) $(LIBSO_LN) && $(LN_S) $(LIBSO) $(LIBSO_LN); \
fi
-- the logic here is a bit wrong.
Also, the link to the static library is undefined:
LIBSO = libduchamp.1.5.dylib LIBSO_LN =
This is set in the configure script.
Note: See
TracTickets for help on using
tickets.

Fixed in [1292]: Makefile now reads:
install : $(INSTALL) -d -m 2755 $(INSTALLDIR) $(INSTALL) -m 755 $(EXEC) $(INSTALLDIR) $(RM) $(INSTALLDIR)/$(EXEC-STUB) cd $(INSTALLDIR) && $(LN_S) $(EXEC) $(EXEC-STUB) -test ! -f $(LIB) || $(INSTALL) -d -m 2755 $(LIBDIR) -test ! -f $(LIB) || $(INSTALL) -m 644 $(LIB) $(LIBDIR) -test ! -f $(LIB) || ( cd $(LIBDIR) && $(RM) $(LIB_LN) && $(LN_S) $(LIB) $(LIB_LN) ) -test ! -f $(LIBSO) || ( $(INSTALL) -m 755 $(LIBSO) $(LIBDIR) && \ if [ "libduchamp.dylib" != "" ] ; then \ cd $(LIBDIR) && $(RM) $(LIBSO_LN) && $(LN_S) $(LIBSO) $(LIBSO_LN); \ fi )