diff --git a/make/defs-orig.mk b/make/defs-orig.mk index ca03b558..74a2b552 100644 --- a/make/defs-orig.mk +++ b/make/defs-orig.mk @@ -83,7 +83,7 @@ ALL_CSRC = $(LOCAL_CSRC) $(PREREQ_CSRC) TEXTCLEAN = $(wildcard *~ .*~ .*.swp *.rep) INCLUDE = -I. -I$(TOPDIR)/include -I$(MODDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE) -LIBDIR = $(MODDIR)/lib +INSTALL_LIBDIR = $(PREFIX)/lib LIB = $(LIBDIR)/lib$(LIBNAME).a MEMBERS = $(LIB)($(OBJ)) #PREFIX = ../# CAUTION: This breaks the installation in the project @@ -102,7 +102,8 @@ CFLAGS += $(CFLAGS_DEBUG) CPPFLAGS += $(CFLAGS_DEBUG) endif -INSTALLED_SHOBJS = $(addprefix $(PREFIX)/lib/,$(SHOBJS)) +LIBDIR = $(MODDIR)/lib +INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) ifeq ($(USE_QT),true) USE_X = true diff --git a/make/rules.mk b/make/rules.mk index 33a6cc98..4cd1bc4c 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -27,7 +27,7 @@ $(LIBDIR): moc_%.cpp: %.h $(MOC) -o $@ $< -lib%.so: %.o +lib%.so: %.o # $(LIB) $(CC) $< $(LDFLAGS) -o $@ $(TOPDIR)/include: @@ -55,7 +55,7 @@ endif $(LIBS): make -C $(LIBDIR) all -$(PREFIX)/lib/%.so: %.so +$(INSTALL_LIBDIR)/%.so: %.so $(INSTALL) $< $@ $(PREFIX)/bin/$(EXE): $(EXE)