mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3437 from orbea/bin_dir

Browse Source 
Allow setting --with-bin_dir
This commit is contained in:
Twinaphex 2016-08-27 02:58:00 +02:00 committed by GitHub
commit dcf818b40b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -167,13 +167,13 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
install: $(TARGET) install: $(TARGET)
rm -f $(OBJDIR)/git_version.o rm -f $(OBJDIR)/git_version.o
mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(BIN_DIR)/ 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6 install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
@ -181,8 +181,8 @@ install: $(TARGET)
install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
uninstall: uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch rm -f $(DESTDIR)$(BIN_DIR/retroarch
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6 rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6

6
qb/config.libs.sh
View File

@ -130,6 +130,12 @@ fi
add_define_make libretro "$LIBRETRO" add_define_make libretro "$LIBRETRO"
} }
if [ "$BIN_DIR" ]; then
add_define_make BIN_DIR "$BIN_DIR"
else
add_define_make BIN_DIR "${PREFIX}/bin"
fi
if [ "$MAN_DIR" ]; then if [ "$MAN_DIR" ]; then
add_define_make MAN_DIR "$MAN_DIR" add_define_make MAN_DIR "$MAN_DIR"
else else

1
qb/config.params.sh
View File

@ -13,6 +13,7 @@ HAVE_LIBUSB=auto # Libusb HID support
C89_LIBUSB=no C89_LIBUSB=no
HAVE_UDEV=auto # Udev/Evdev gamepad support HAVE_UDEV=auto # Udev/Evdev gamepad support
HAVE_LIBRETRO= # Libretro library used HAVE_LIBRETRO= # Libretro library used
HAVE_BIN_DIR= # Binary install directory
HAVE_MAN_DIR= # Manpage install directory HAVE_MAN_DIR= # Manpage install directory
HAVE_GLES_LIBS= # Link flags for custom GLES library HAVE_GLES_LIBS= # Link flags for custom GLES library
HAVE_GLES_CFLAGS= # C-flags for custom GLES library HAVE_GLES_CFLAGS= # C-flags for custom GLES library