Magellan Linux

Diff of /smage/trunk/extras/tigervnc/tigervnc-1.0.90_svn4262-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1240 by niro, Tue Feb 1 13:32:51 2011 UTC revision 1242 by niro, Tue Feb 1 13:47:21 2011 UTC
# Line 73  src_compile() Line 73  src_compile()
73   mconfigure --disable-static || die   mconfigure --disable-static || die
74   # only build neccessary things   # only build neccessary things
75   mmake -j1 -C common || die   mmake -j1 -C common || die
76   mmake -j1 -C vncpasswd || die   mmake -j1 -C unix/vncpasswd || die
77    
78   # fix build issues   # fix build issues
79   export CFLAGS="$(pkg-config --cflags libdrm)"   export CFLAGS="$(pkg-config --cflags libdrm)"
# Line 81  src_compile() Line 81  src_compile()
81   # build the x11 module   # build the x11 module
82   cd ${XORGDDIR}   cd ${XORGDDIR}
83   mconfigure \   mconfigure \
  --prefix=/usr/X11R6 \  
  --datadir=/usr/X11R6/share \  
84   --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \   --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
85   --with-rgb-path=/usr/X11R6/share/X11/rgb.txt \   --with-rgb-path=/usr/share/X11/rgb.txt \
86   --with-xkb-output=/usr/X11R6/share/X11/xkb \   --with-xkb-output=/usr/share/X11/xkb \
87   --with-pic \   --with-pic \
88   --disable-xorg \   --disable-xorg \
89   --disable-composite \   --disable-composite \
# Line 115  src_compile() Line 113  src_compile()
113  src_install()  src_install()
114  {  {
115   cd ${SRCDIR}   cd ${SRCDIR}
116   mmake -C vncpasswd DESTDIR=${BINDIR} install || die   mmake -C unix/vncpasswd DESTDIR=${BINDIR} install || die
117    
118   cd ${XORGDDIR}/hw/vnc   cd ${XORGDDIR}/hw/vnc
119   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die

Legend:
Removed from v.1240  
changed lines
  Added in v.1242