SHARE
TWEET

Untitled

a guest Sep 14th, 2011 65 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/build/generic/Makefile b/build/generic/Makefile
  2. index 32abe0d..8e48138 100644
  3. --- a/build/generic/Makefile
  4. +++ b/build/generic/Makefile
  5. @@ -141,16 +141,25 @@ $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
  6.  #-----------------------------------------------------------------------------
  7.  
  8.  install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)
  9. -       @echo "  D: $(libdir)"
  10. -       @$(INSTALL) -d $(DESTDIR)$(libdir)
  11. -       @echo "  I: $(libdir)/$(SHARED_LIB)"
  12. -       @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
  13. -       @echo "  I: $(libdir)/$(STATIC_LIB)"
  14. -       @$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
  15.         @echo "  D: $(includedir)"
  16.         @$(INSTALL) -d $(DESTDIR)$(includedir)
  17.         @echo "  I: $(includedir)/xvid.h"
  18.         @$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
  19. +       @echo "  D: $(libdir)"
  20. +       @$(INSTALL) -d $(DESTDIR)$(libdir)
  21. +       @echo "  I: $(libdir)/$(STATIC_LIB)"
  22. +       @$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
  23. +ifeq ($(SHARED_EXTENSION),dll)
  24. +       @echo "  D: $(bindir)"
  25. +       @$(INSTALL) -d $(DESTDIR)$(bindir)
  26. +       @echo "  I: $(bindir)/$(SHARED_LIB)"
  27. +       @$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(bindir)/$(SHARED_LIB)
  28. +       @echo "  I: $(libdir)/$(SHARED_LIB).a"
  29. +       @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB).a $(DESTDIR)$(libdir)/$(SHARED_LIB).a
  30. +else
  31. +       @echo "  I: $(libdir)/$(SHARED_LIB)"
  32. +       @$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
  33. +endif
  34.  
  35.  #-----------------------------------------------------------------------------
  36.  # Platorm specific file -- dumb rules for people executing make before
  37. diff --git a/build/generic/platform.inc.in b/build/generic/platform.inc.in
  38. index 8596b81..7a26e22 100644
  39. --- a/build/generic/platform.inc.in
  40. +++ b/build/generic/platform.inc.in
  41. @@ -61,6 +61,7 @@ INSTALL=@INSTALL@
  42.  DESTDIR=
  43.  prefix=@prefix@
  44.  exec_prefix=@exec_prefix@
  45. +bindir=@bindir@
  46.  libdir=@libdir@
  47.  includedir=@includedir@
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top