Accepting request 86426 from Base:System

- cross-build fix: use %__cc, %configure macros
- configure: explicitly set bindir (forwarded request 86405 from uli_suse)

OBS-URL: https://build.opensuse.org/request/show/86426
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=53
This commit is contained in:
Ruediger Oertel 2011-10-04 16:12:25 +00:00 committed by Git OBS Bridge
commit eee53e698f
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 30 15:28:41 UTC 2011 - uli@suse.com
- cross-build fix: use %__cc, %configure macros
- configure: explicitly set bindir
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 14 15:58:43 CEST 2011 - sbrabec@suse.cz Wed Sep 14 15:58:43 CEST 2011 - sbrabec@suse.cz

View File

@ -101,15 +101,16 @@ pushd data/keymaps/i386
# bnc#435121 # bnc#435121
test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
popd popd
./configure \ %configure \
--prefix=/ \ --prefix=/ \
--datadir=%{kbd} \ --datadir=%{kbd} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--bindir=/bin \
--enable-nls \ --enable-nls \
--localedir=/usr/share/locale \ --localedir=/usr/share/locale \
--enable-optional-progs --enable-optional-progs
make CFLAGS="$RPM_OPT_FLAGS -Os" make CFLAGS="$RPM_OPT_FLAGS -Os"
gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c %{__cc} $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c
# fix lat2-16.psfu (bnc#340579) # fix lat2-16.psfu (bnc#340579)
font=data/consolefonts/lat2a-16.psfu font=data/consolefonts/lat2a-16.psfu
./src/psfxtable -i $font -it data/unimaps/lat2u.uni \ ./src/psfxtable -i $font -it data/unimaps/lat2u.uni \