Changeset 5f31634 in freewrt

Timestamp:

May 28, 2007, 3:34:11 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

7c70e07

Parents:

6bef948

Message:

improvements in codepage handling, should fix PR#312

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2675 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/samba/Makefile (modified) (2 diffs)

package/samba/Makefile

@@ -17 +17 @@
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${FWRT_SAMBA_CODEPAGE},)
-PKG_CP:=ISO8859-1
+ifeq ($(strip ${FWRT_SAMBA_CODEPAGE}),)
+CP:=            ISO8859-1
 else
-PKG_CP:=${FWRT_SAMBA_CODEPAGE}
+CP:=            ${FWRT_SAMBA_CODEPAGE}
 endif
 
@@ -142 +142 @@
         ${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba/
         ${INSTALL_BIN} ${WRKINST}/usr/bin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
-        cd ${WRKINST}/usr/share/samba; test ! -e codepage.${PKG_CP} || \
-            ${INSTALL_DATA} codepage.${PKG_CP} ${IDIR_SAMBA}/usr/share/samba/; \
-            ${INSTALL_DATA} unicode_map.${PKG_CP} unicode_map.ISO8859-1 \
-            ${IDIR_SAMBA}/usr/share/samba/
+        cd ${WRKINST}/usr/share/samba; test ! -e codepage.${CP} || \
+            ${INSTALL_DATA} codepage.${CP} ${IDIR_SAMBA}/usr/share/samba/; \
+            ${INSTALL_DATA} unicode_map.${CP} ${IDIR_SAMBA}/usr/share/samba/; \
+            ${INSTALL_DATA} unicode_map.ISO8859-1 ${IDIR_SAMBA}/usr/share/samba/
         ${INSTALL_DIR} ${IDIR_SAMBA_PASSWD}/usr/bin
         ${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd ${IDIR_SAMBA_PASSWD}/usr/bin/