Browse Source

Add INSTALL makefile variable

Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Måns Rullgård 15 years ago
parent
commit
fd676deb96
3 changed files with 9 additions and 8 deletions
  1. +3
    -3
      Makefile
  2. +1
    -0
      configure
  3. +5
    -5
      subdir.mak

+ 3
- 3
Makefile View File

@@ -105,15 +105,15 @@ install: $(INSTALL_TARGETS-yes)


install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes) install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
mkdir -p "$(BINDIR)" mkdir -p "$(BINDIR)"
install -c -m 755 $(PROGS) "$(BINDIR)"
$(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"


install-data: $(DATA_FILES) install-data: $(DATA_FILES)
mkdir -p "$(DATADIR)" mkdir -p "$(DATADIR)"
install -m 644 $(DATA_FILES) "$(DATADIR)"
$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"


install-man: $(MANPAGES) install-man: $(MANPAGES)
mkdir -p "$(MANDIR)/man1" mkdir -p "$(MANDIR)/man1"
install -m 644 $(MANPAGES) "$(MANDIR)/man1"
$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"


uninstall: uninstall-progs uninstall-data uninstall-man uninstall: uninstall-progs uninstall-data uninstall-man




+ 1
- 0
configure View File

@@ -3005,6 +3005,7 @@ SDL_LIBS=$sdl_libs
SDL_CFLAGS=$sdl_cflags SDL_CFLAGS=$sdl_cflags
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
EXTRALIBS=$extralibs EXTRALIBS=$extralibs
INSTALL=install
EOF EOF


get_version(){ get_version(){


+ 5
- 5
subdir.mak View File

@@ -63,7 +63,7 @@ endif


install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME) install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
mkdir -p "$(SHLIBDIR)" mkdir -p "$(SHLIBDIR)"
install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
cd "$(SHLIBDIR)" && \ cd "$(SHLIBDIR)" && \
$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -73,17 +73,17 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)


install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME) install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
mkdir -p "$(LIBDIR)" mkdir -p "$(LIBDIR)"
install -m 644 $$< "$(LIBDIR)"
$$(INSTALL) -m 644 $$< "$(LIBDIR)"
$(LIB_INSTALL_EXTRA_CMD) $(LIB_INSTALL_EXTRA_CMD)


install-headers:: install-headers::
mkdir -p "$(INCINSTDIR)" mkdir -p "$(INCINSTDIR)"
mkdir -p "$(LIBDIR)/pkgconfig" mkdir -p "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
$$(INSTALL) -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
ifdef BUILT_HEADERS ifdef BUILT_HEADERS
install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
$$(INSTALL) -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
endif endif
install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
$$(INSTALL) -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"


uninstall-libs:: uninstall-libs::
-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \


Loading…
Cancel
Save