Changeset 2675

Show
Ignore:
Timestamp:
05/28/07 15:34:11 (2 years ago)
Author:
tg
Message:

improvements in codepage handling, should fix PR#312

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/samba/Makefile

    r2653 r2675  
    1717include ${TOPDIR}/mk/package.mk 
    1818 
    19 ifeq (${FWRT_SAMBA_CODEPAGE},) 
    20 PKG_CP:=ISO8859-1 
     19ifeq ($(strip ${FWRT_SAMBA_CODEPAGE}),) 
     20CP:=           ISO8859-1 
    2121else 
    22 PKG_CP:=${FWRT_SAMBA_CODEPAGE} 
     22CP:=           ${FWRT_SAMBA_CODEPAGE} 
    2323endif 
    2424 
    …… 
    142142        ${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba/ 
    143143        ${INSTALL_BIN} ${WRKINST}/usr/bin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin 
    144         cd ${WRKINST}/usr/share/samba; test ! -e codepage.${PKG_CP} || \ 
    145             ${INSTALL_DATA} codepage.${PKG_CP} ${IDIR_SAMBA}/usr/share/samba/; \ 
    146             ${INSTALL_DATA} unicode_map.${PKG_CP} unicode_map.ISO8859-1 \ 
    147             ${IDIR_SAMBA}/usr/share/samba/ 
     144        cd ${WRKINST}/usr/share/samba; test ! -e codepage.${CP} || \ 
     145            ${INSTALL_DATA} codepage.${CP} ${IDIR_SAMBA}/usr/share/samba/; \ 
     146            ${INSTALL_DATA} unicode_map.${CP} ${IDIR_SAMBA}/usr/share/samba/; \ 
     147            ${INSTALL_DATA} unicode_map.ISO8859-1 ${IDIR_SAMBA}/usr/share/samba/ 
    148148        ${INSTALL_DIR} ${IDIR_SAMBA_PASSWD}/usr/bin 
    149149        ${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd ${IDIR_SAMBA_PASSWD}/usr/bin/