mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 03:02:36 +01:00
Fix bug in installation process: MKDIR must respect DESTDIR.
llvm-svn: 11236
This commit is contained in:
parent
ada23acba4
commit
d8be884ca5
2
Makefile
2
Makefile
@ -32,7 +32,7 @@ tools-only: all
|
|||||||
.PHONY: install-includes
|
.PHONY: install-includes
|
||||||
|
|
||||||
install-includes:
|
install-includes:
|
||||||
$(MKDIR) $(includedir)/llvm
|
$(MKDIR) $(DESTDIR)$(includedir)/llvm
|
||||||
cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
|
cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
|
||||||
|
|
||||||
install:: install-includes
|
install:: install-includes
|
||||||
|
@ -548,7 +548,7 @@ $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
|
|||||||
@${ECHO} ======= Finished building $(LIBRARYNAME) dynamic debug library =======
|
@${ECHO} ======= Finished building $(LIBRARYNAME) dynamic debug library =======
|
||||||
|
|
||||||
install-dynamic-library: $(LIBNAME_CUR)
|
install-dynamic-library: $(LIBNAME_CUR)
|
||||||
$(MKDIR) $(libdir)
|
$(MKDIR) $(DESTDIR)$(libdir)
|
||||||
$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_CUR) $(DESTDIR)$(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
|
$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_CUR) $(DESTDIR)$(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -573,7 +573,7 @@ $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
|
|||||||
@${ECHO} ======= Finished building $(LIBRARYNAME) archive debug library =======
|
@${ECHO} ======= Finished building $(LIBRARYNAME) archive debug library =======
|
||||||
|
|
||||||
install-archive-library: $(LIBNAME_ACUR)
|
install-archive-library: $(LIBNAME_ACUR)
|
||||||
$(MKDIR) $(libdir)
|
$(MKDIR) $(DESTDIR)$(libdir)
|
||||||
$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_ACUR) $(DESTDIR)$(libdir)/lib$(LIBRARYNAME).a
|
$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_ACUR) $(DESTDIR)$(libdir)/lib$(LIBRARYNAME).a
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -603,7 +603,7 @@ $(LIBNAME_OBJG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
|
|||||||
$(VERB) $(Relink) -o $@ $(RObjectsG) $(LibSubDirs)
|
$(VERB) $(Relink) -o $@ $(RObjectsG) $(LibSubDirs)
|
||||||
|
|
||||||
install-single-object-library: $(LIBNAME_OBJCUR)
|
install-single-object-library: $(LIBNAME_OBJCUR)
|
||||||
$(MKDIR) $(libdir)
|
$(MKDIR) $(DESTDIR)$(libdir)
|
||||||
$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_OBJCUR) $(DESTDIR)$(libdir)/$(LIBRARYNAME).o
|
$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_OBJCUR) $(DESTDIR)$(libdir)/$(LIBRARYNAME).o
|
||||||
|
|
||||||
endif
|
endif
|
||||||
@ -686,7 +686,7 @@ $(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir
|
|||||||
@${ECHO} ======= Finished building $(TOOLNAME) profile executable =======
|
@${ECHO} ======= Finished building $(TOOLNAME) profile executable =======
|
||||||
|
|
||||||
install:: $(TOOLEXENAMES)
|
install:: $(TOOLEXENAMES)
|
||||||
$(MKDIR) $(bindir)
|
$(MKDIR) $(DESTDIR)$(bindir)
|
||||||
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
|
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user