mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-12 20:16:49 +02:00
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#GREEN_PARENT_DEV="eth0"
|
||||
#GREEN_PARENT_DEV=eth0
|
||||
#GREEN_VLAN_ID=20
|
||||
#GREEN_MAC_ADDRESS="00:11:22:33:44:55"
|
||||
#BLUE_PARENT_DEV="green0"
|
||||
#GREEN_MAC_ADDRESS=00:11:22:33:44:55
|
||||
#BLUE_PARENT_DEV=green0
|
||||
#BLUE_VLAN_ID=30
|
||||
#BLUE_MAC_ADDRESS="00:22:33:44:55:66"
|
||||
#ORANGE_PARENT_DEV="green0"
|
||||
#BLUE_MAC_ADDRESS=00:22:33:44:55:66
|
||||
#ORANGE_PARENT_DEV=green0
|
||||
#ORANGE_VLAN_ID=40
|
||||
#ORANGE_MAC_ADDRESS="00:33:44:55:66:77"
|
||||
#ORANGE_MAC_ADDRESS=00:33:44:55:66:77
|
||||
|
||||
@@ -916,7 +916,7 @@ CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_TAG_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_VLAN_8021Q=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
|
||||
@@ -1195,7 +1195,7 @@ CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_TAG_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_VLAN_8021Q=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -836,7 +836,7 @@ CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
CONFIG_VLAN_8021Q_MVRP=y
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
CONFIG_LLC=m
|
||||
# CONFIG_LLC2 is not set
|
||||
|
||||
@@ -1102,7 +1102,7 @@ CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_TAG_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_VLAN_8021Q=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
|
||||
@@ -1114,7 +1114,7 @@ CONFIG_NET_DSA=y
|
||||
CONFIG_NET_DSA_TAG_DSA=y
|
||||
CONFIG_NET_DSA_TAG_EDSA=y
|
||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
||||
CONFIG_VLAN_8021Q=y
|
||||
CONFIG_VLAN_8021Q=m
|
||||
CONFIG_VLAN_8021Q_GVRP=y
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1 +0,0 @@
|
||||
../../../common/php
|
||||
1
config/rootfiles/core/fifteen/filelists/vim
Symbolic link
1
config/rootfiles/core/fifteen/filelists/vim
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/vim
|
||||
@@ -5,6 +5,7 @@ srv/web/ipfire/cgi-bin/connections.cgi
|
||||
srv/web/ipfire/cgi-bin/credits.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/services.cgi
|
||||
srv/web/ipfire/cgi-bin/urlfilter.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
srv/web/ipfire/html/themes/ipfire/include/functions.pl
|
||||
srv/web/ipfire/html/themes/ipfire/include/style.css
|
||||
|
||||
42
config/vim/vimrc
Normal file
42
config/vim/vimrc
Normal file
@@ -0,0 +1,42 @@
|
||||
if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
|
||||
set fileencodings=ucs-bom,utf-8,latin1
|
||||
endif
|
||||
|
||||
set nocompatible
|
||||
set bs=indent,eol,start " allow backspacing over everything in insert mode
|
||||
set viminfo='20,\"50 " read/write a .viminfo file, don't store more
|
||||
" than 50 lines of registers
|
||||
set history=50 " keep 50 lines of command line history
|
||||
set ruler " show the cursor position all the time
|
||||
|
||||
" Only do this part when compiled with support for autocommands
|
||||
if has("autocmd")
|
||||
augroup ipfire
|
||||
autocmd!
|
||||
|
||||
" In text files, always limit the width of text to 78 characters
|
||||
" autocmd BufRead *.txt set tw=78
|
||||
|
||||
" When editing a file, always jump to the last cursor position
|
||||
autocmd BufReadPost *
|
||||
\ if line("'\"") > 0 && line ("'\"") <= line("$") |
|
||||
\ exe "normal! g'\"" |
|
||||
\ endif
|
||||
|
||||
" don't write swapfile on most commonly used directories for NFS mounts or USB sticks
|
||||
autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
|
||||
|
||||
" start with spec file template
|
||||
autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
|
||||
|
||||
augroup END
|
||||
endif
|
||||
|
||||
syntax on
|
||||
if (&term == "iterm") || (&term == "putty")
|
||||
set background=dark
|
||||
endif
|
||||
|
||||
" Don't wake up system with blinking cursor:
|
||||
" http://www.linuxpowertop.org/known.php
|
||||
let &guicursor = &guicursor . ",a:blinkon0"
|
||||
@@ -446,7 +446,7 @@ sub showEditBox() {
|
||||
<table width='100%'>
|
||||
<tr>
|
||||
<td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td>
|
||||
<td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td>
|
||||
<td width='40%'><input type='text' name='SSID' value="$settings{'SSID'}" size='25'/></td>
|
||||
<td class='base' width='10%'>$Lang::tr{'enabled'}</td>
|
||||
<td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
|
||||
</tr>
|
||||
@@ -464,7 +464,7 @@ sub showEditBox() {
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='base' width='20%'>$Lang::tr{'wlan client psk'}: </td>
|
||||
<td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td>
|
||||
<td width='40%'><input type='password' name='PSK' value="$settings{'PSK'}" size='25'/></td>
|
||||
<td colspan="2" width='40%'></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@@ -591,4 +591,10 @@ char *de_tr[] = {
|
||||
"Beim Herunterladen ist ein Fehler aufgetreten!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"DHCP MTU setzen:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identifizieren",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Die Leds dieses Netzwerkports sollten jetzt blinken ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Dieser Netzwerkport untestützt die Funktion leider nicht.",
|
||||
};
|
||||
|
||||
@@ -587,4 +587,10 @@ char *en_tr[] = {
|
||||
"Error while downloading!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"Force DHCP mtu:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -583,4 +583,10 @@ char *es_tr[] = {
|
||||
"Error while downloading!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"Force DHCP mtu:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -583,4 +583,10 @@ char *fr_tr[] = {
|
||||
"Erreur pendant le téléchargement!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"Force DHCP mtu:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -587,4 +587,10 @@ char *nl_tr[] = {
|
||||
"Fout tijdens downloaden!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"Forceer DHCP mtu:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -583,4 +583,10 @@ char *pl_tr[] = {
|
||||
"Błąd podczas pobierania!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"Wymuś mtu DHCP:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -581,4 +581,10 @@ char *ru_tr[] = {
|
||||
"Во время загрузки произошла ошибка!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"Форсировать DHCP mtu:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -587,4 +587,10 @@ char *tr_tr[] = {
|
||||
"İndirirken hata!",
|
||||
/* TR_DHCP_FORCE_MTU */
|
||||
"DHCP mtu zorla:",
|
||||
/* TR_IDENTIFY */
|
||||
"Identify",
|
||||
/* TR_IDENTIFY_SHOULD_BLINK */
|
||||
"Selected port should blink now ...",
|
||||
/* TR_IDENTIFY_NOT_SUPPORTED */
|
||||
"Function is not supported by this port.",
|
||||
};
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
include Config
|
||||
|
||||
VER = 1.17
|
||||
DATVER = 02072013
|
||||
DATVER = 01102013
|
||||
|
||||
THISAPP = Geo-IP-PurePerl-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
|
||||
|
||||
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
|
||||
GeoIP.dat-$(DATVER).gz_MD5 = 25d59395b43d676fcbab05e7610a7b58
|
||||
GeoIP.dat-$(DATVER).gz_MD5 = 4aecef560aa6dacfe7e59dad8a12914b
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 3.10.14
|
||||
VER = 3.10.15
|
||||
|
||||
RPI_PATCHES = linux-3.10.10-c1af7c6
|
||||
GRS_PATCHES = grsecurity-2.9.1-3.10.14-ipfire1.patch.xz
|
||||
GRS_PATCHES = grsecurity-2.9.1-3.10.15-ipfire1.patch.xz
|
||||
|
||||
THISAPP = linux-$(VER)
|
||||
DL_FILE = linux-$(VER).tar.xz
|
||||
@@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
|
||||
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
|
||||
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
|
||||
|
||||
$(DL_FILE)_MD5 = 3cd1e4b50fb9decd63754ae80f3b2414
|
||||
$(DL_FILE)_MD5 = 3fe22263308674d92c6d106f633eca52
|
||||
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = ef9274b3ff5d05daaaa4bdbe86ad00fc
|
||||
$(GRS_PATCHES)_MD5 = 504b12ac9f2a3c12ccfeb1c3768f49e4
|
||||
$(GRS_PATCHES)_MD5 = a9a6c5009cef39cfb798da1466044e33
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = samba
|
||||
PAK_VER = 52
|
||||
PAK_VER = 53
|
||||
|
||||
DEPS = "cups"
|
||||
|
||||
|
||||
27
lfs/vim
27
lfs/vim
@@ -24,12 +24,12 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 7.2
|
||||
VER = 7.4
|
||||
|
||||
THISAPP = vim-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/vim72
|
||||
DIR_APP = $(DIR_SRC)/vim74
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = f0901284b338e448bfd79ccca0041254
|
||||
$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -70,19 +70,18 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.2-fixes-4.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.2-mandir-1.patch
|
||||
cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --enable-multibyte --disable-nls
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--with-features=huge \
|
||||
--enable-multibyte \
|
||||
--enable-gui=no \
|
||||
--disable-nls
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
ln -sv vim /usr/bin/vi
|
||||
echo "set nocompatible" > /etc/vimrc
|
||||
echo "set backspace=2" >> /etc/vimrc
|
||||
echo "set ruler" >> /etc/vimrc
|
||||
echo "syntax on" >> /etc/vimrc
|
||||
echo -e "if (&term == \"iterm\") || (&term == \"putty\")" >> /etc/vimrc
|
||||
echo " set background=dark" >> /etc/vimrc
|
||||
echo "endif" >> /etc/vimrc
|
||||
|
||||
ln -svf vim /usr/bin/vi
|
||||
install -m 644 $(DIR_SRC)/config/vim/vimrc /etc/vimrc
|
||||
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
2
make.sh
2
make.sh
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
|
||||
SNAME="ipfire" # Short name
|
||||
VERSION="2.13" # Version number
|
||||
CORE="73" # Core Level (Filename)
|
||||
PAKFIRE_CORE="72" # Core Level (PAKFIRE)
|
||||
PAKFIRE_CORE="73" # Core Level (PAKFIRE)
|
||||
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
|
||||
SLOGAN="www.ipfire.org" # Software slogan
|
||||
CONFIG_ROOT=/var/ipfire # Configuration rootdir
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -80,13 +80,15 @@ for interface in green0 red0 blue0 orange0; do
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "Creating VLAN interface ${interface}..."
|
||||
vconfig add ${PARENT_DEV} ${VLAN_ID}
|
||||
ip link set ${PARENT_DEV}.${VLAN_ID} name ${interface}
|
||||
|
||||
# Build command line.
|
||||
command="ip link add link ${PARENT_DEV} name ${interface}"
|
||||
if [ -n "${MAC_ADDRESS}" ]; then
|
||||
ip link set ${interface} address ${MAC_ADDRESS}
|
||||
command="${command} address ${MAC_ADDRESS}"
|
||||
fi
|
||||
command="${command} type vlan id ${VLAN_ID}"
|
||||
|
||||
echo "Creating VLAN interface ${interface}..."
|
||||
${command}
|
||||
|
||||
# Bring up the parent device.
|
||||
ip link set ${PARENT_DEV} up
|
||||
@@ -100,7 +102,7 @@ for interface in green0 red0 blue0 orange0; do
|
||||
|
||||
echo "Removing VLAN interface ${interface}..."
|
||||
ip link set ${interface} down
|
||||
vconfig rem ${interface}
|
||||
ip link delete ${interface}
|
||||
;;
|
||||
|
||||
*)
|
||||
|
||||
@@ -615,6 +615,7 @@ int nicmenu(int colour)
|
||||
int rc, choise = 0, count = 0, kcount = 0, mcount = 0, i, j, nic_in_use;
|
||||
int found_NIC_as_Card[4];
|
||||
char message[STRING_SIZE];
|
||||
char temp[STRING_SIZE];
|
||||
|
||||
char cMenuInhalt[STRING_SIZE];
|
||||
char MenuInhalt[20][180];
|
||||
@@ -657,8 +658,20 @@ int nicmenu(int colour)
|
||||
pMenuInhalt[mcount] = NULL;
|
||||
|
||||
sprintf(message, ctr[TR_CHOOSE_NETCARD], ucolourcard[colour]);
|
||||
rc = newtWinMenu( ctr[TR_NETCARDMENU2], message, 50, 5, 5, 6, pMenuInhalt, &choise, ctr[TR_OK], ctr[TR_SELECT], ctr[TR_CANCEL], NULL);
|
||||
|
||||
rc=2;
|
||||
while ( rc == 2 ) {
|
||||
rc = newtWinMenu( ctr[TR_NETCARDMENU2], message, 50, 5, 5, 6, pMenuInhalt, &choise, ctr[TR_SELECT], ctr[TR_IDENTIFY], ctr[TR_CANCEL], NULL);
|
||||
if ( rc == 2 ) {
|
||||
sprintf(temp, "/sbin/ip link set %s up", nics[found_NIC_as_Card[choise]].nic);
|
||||
mysystem(temp);
|
||||
sprintf(temp, "/usr/sbin/ethtool -p %s 10", nics[found_NIC_as_Card[choise]].nic);
|
||||
if (runcommandwithstatus(temp,ctr[TR_IDENTIFY_SHOULD_BLINK]) != 0) {
|
||||
errorbox(ctr[TR_IDENTIFY_NOT_SUPPORTED]);
|
||||
sprintf(temp, "/sbin/ip link set %s down", nics[found_NIC_as_Card[choise]].nic);
|
||||
mysystem(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( rc == 0 || rc == 1) {
|
||||
write_configs_netudev(found_NIC_as_Card[choise], colour);
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,82 +0,0 @@
|
||||
Submitted By: Alexander E. Patrakov
|
||||
Date: 2006-05-27
|
||||
Initial Package Version: 7.0
|
||||
Upstream status: LFS specific
|
||||
Description: Adjusts installation of manual pages to meet Man-DB expectations.
|
||||
|
||||
Additional change to explicitly install the man pages into
|
||||
/usr/share/man instead of /usr/man by Ag Hatzim.
|
||||
|
||||
--- vim70/src/Makefile.orig 2006-05-27 12:49:31.767959808 +0300
|
||||
+++ vim70/src/Makefile 2006-05-27 12:49:55.778309680 +0300
|
||||
@@ -867,7 +867,7 @@
|
||||
# Uncomment the next line to install Vim in "/usr/bin"
|
||||
#BINDIR = /usr/bin
|
||||
# Uncomment the next line to install Vim manuals in "/usr/share/man/man1"
|
||||
-#MANDIR = /usr/share/man
|
||||
+MANDIR = /usr/share/man
|
||||
# Uncomment the next line to install Vim help files in "/usr/share/vim"
|
||||
#DATADIR = /usr/share
|
||||
|
||||
@@ -1325,7 +1325,7 @@
|
||||
DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR)
|
||||
DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
|
||||
DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR)
|
||||
-DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
|
||||
+DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
|
||||
DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
|
||||
|
||||
# BASIC_SRC: files that are always used
|
||||
@@ -1905,52 +1905,24 @@
|
||||
# install the language specific files for tools, if they were unpacked
|
||||
install-tool-languages:
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
||||
|
||||
# install the language specific files, if they were unpacked
|
||||
install-languages: languages $(DEST_LANG) $(DEST_KMAP)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
||||
- -$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_FR) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_FR_I) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_FR_U) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_IT) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_IT_I) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_IT_U) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_PL) $(INSTALLMLARGS)
|
||||
-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_PL_I) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_PL_U) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
$(DEST_MAN_RU) $(INSTALLMLARGS)
|
||||
- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
|
||||
- $(DEST_MAN_RU_U) $(INSTALLMLARGS)
|
||||
if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
|
||||
cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
|
||||
INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
|
||||
Reference in New Issue
Block a user