Merge pull request #3019 from orbea/master

Set base man directory in MAN_DIR and move manpages to man6
This commit is contained in:
Twinaphex 2016-05-23 02:19:49 +02:00
commit 06aa001b82
5 changed files with 15 additions and 15 deletions

View File

@ -163,14 +163,14 @@ install: $(TARGET)
mkdir -p $(DESTDIR)$(PREFIX)/bin 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)$(MAN_DIR) 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
install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin
install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
uninstall:
@ -178,8 +178,8 @@ uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
rm -f $(DESTDIR)$(MAN_DIR)/retroarch.1
rm -f $(DESTDIR)$(MAN_DIR)/retroarch-cg2glsl.1
rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg
clean:

View File

@ -1,6 +1,6 @@
.\" retroarch-cg2glsl.1
.\" retroarch-cg2glsl.6
.TH "RETROARCH-CG2GLSL" "1" "July 10, 2014" "RETROARCH-CG2GLSL" "System Manager's Manual: retroarch-cg2glsl"
.TH "RETROARCH-CG2GLSL" "6" "July 10, 2014" "RETROARCH-CG2GLSL" "System Manager's Manual: retroarch-cg2glsl"
.SH "NAME"
@ -30,4 +30,4 @@ retroarch-cg2glsl prog.cg(p) prog.glsl(p)
.TP
\fBConvert a Cg directory to GLSL directory\fR
retroarch-cg2glsl cg-dir out-xml-shader-dir
retroarch-cg2glsl cg-dir out-xml-shader-dir

View File

@ -1,6 +1,6 @@
.\" retroarch-joyconfig.1:
.\" retroarch-joyconfig.6:
.TH "RETROARCH-JOYCONFIG" "1" "October 1, 2011" "RETROARCH-JOYCONFIG" "System Manager's Manual: retroarch-joyconfig"
.TH "RETROARCH-JOYCONFIG" "6" "October 1, 2011" "RETROARCH-JOYCONFIG" "System Manager's Manual: retroarch-joyconfig"
.SH NAME
@ -78,6 +78,6 @@ Adds a timeout of N seconds to each bind. If timed out, the bind will not be use
Prints help message.
.SH "SEE ALSO"
\fBretroarch\fR(1)
\fBretroarch\fR(6)
.\"

View File

@ -1,6 +1,6 @@
.\" retroarch.1:
.\" retroarch.6:
.TH "RETROARCH" "1" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch"
.TH "RETROARCH" "6" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch"
.SH NAME
@ -235,4 +235,4 @@ Disables all kinds of content patching.
Detach from the current console. This is currently only relevant for Microsoft Windows.
.SH "SEE ALSO"
\fBretroarch-joyconfig\fR(1)
\fBretroarch-joyconfig\fR(6)

View File

@ -133,7 +133,7 @@ fi
if [ "$MAN_DIR" ]; then
add_define_make MAN_DIR "$MAN_DIR"
else
add_define_make MAN_DIR "${PREFIX}/share/man/man1"
add_define_make MAN_DIR "${PREFIX}/share/man"
fi
if [ "$OS" = 'Win32' ]; then