mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Set BIN_SINSTALL in a way that actually works (make is not sh)

Browse source 
Originally committed to SVN as r6265.
This commit is contained in:
Thomas Goyne 2012-01-10 20:56:15 +00:00
parent 237193a4bb
commit 5ab777f230
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/Makefile.target
View file

@ -67,6 +67,8 @@ ifeq (install, $(MAKECMDGOALS))
INSTALL_LIB = $(addprefix $(P_LIB)/, $(LIB_SHARED) $(LIB_SHARED_FULL)) INSTALL_LIB = $(addprefix $(P_LIB)/, $(LIB_SHARED) $(LIB_SHARED_FULL))
endif endif
BIN_SINSTALL=$(BIN_INSTALL)
install: $(SUBDIRS) install-share install-program install-lib install: $(SUBDIRS) install-share install-program install-lib
install-strip: install-strip:
@ -75,13 +77,13 @@ install-strip:
install-program: install-program:
ifdef PROGRAM_INSTALL ifdef PROGRAM_INSTALL
@$(BIN_MKDIR) -p $(DESTDIR)$(P_BINDIR) @$(BIN_MKDIR) -p $(DESTDIR)$(P_BINDIR)
@${BIN_SINSTALL:-$BIN_INSTALL} $(PROGRAM) $(DESTDIR)$(P_BINDIR)/$(PROGRAM) @$(BIN_SINSTALL) $(PROGRAM) $(DESTDIR)$(P_BINDIR)/$(PROGRAM)
endif endif
install-lib: install-lib:
ifdef LIB_SHARED_INSTALL ifdef LIB_SHARED_INSTALL
$(BIN_MKDIR) -p $(DESTDIR)$(P_LIB) $(BIN_MKDIR) -p $(DESTDIR)$(P_LIB)
${BIN_SINSTALL:-$BIN_INSTALL} $(LIB_SHARED_FULL) $(DESTDIR)$(P_LIB)/$(LIB_SHARED_FULL) $(BIN_SINSTALL) $(LIB_SHARED_FULL) $(DESTDIR)$(P_LIB)/$(LIB_SHARED_FULL)
$(BIN_LN) -sf $(LIB_SHARED_FULL) $(DESTDIR)$(P_LIB)/$(LIB_SHARED) $(BIN_LN) -sf $(LIB_SHARED_FULL) $(DESTDIR)$(P_LIB)/$(LIB_SHARED)
endif endif