Browse Source

Benjamin Schieder:


			
			
				rocklinux
			
			
		
Benjamin Schieder 19 years ago
parent
commit
a7ce74ff6a
3 changed files with 8 additions and 2 deletions
  1. +2
    -0
      Documentation/Developers/PKG-BUILD-VARS
  2. +4
    -0
      scripts/Build-Pkg
  3. +2
    -2
      scripts/functions

+ 2
- 0
Documentation/Developers/PKG-BUILD-VARS

@ -57,6 +57,8 @@ includedir .... where the header files should be installed
autoextract ... '0' = skip automatic untar autoextract ... '0' = skip automatic untar
autopatch ..... '0' = skip automatic patching autopatch ..... '0' = skip automatic patching
chownsrcdir ... '0' = don't make a chown to root after extracting the $srctar chownsrcdir ... '0' = don't make a chown to root after extracting the $srctar
desktopfiles .. filenames of the desktop files to install ($confdir/*.desktop)
set to an empty string to deactivate desktop file installation
nocvsinsrcdir . '0' = don't remove CVS and .svn directories in $srcdir nocvsinsrcdir . '0' = don't remove CVS and .svn directories in $srcdir
srctar ........ filename of source tar file ('auto' = autodetect) srctar ........ filename of source tar file ('auto' = autodetect)
srcdir ........ directory in source tar file ('auto' = autodetect) srcdir ........ directory in source tar file ('auto' = autodetect)

+ 4
- 0
scripts/Build-Pkg

@ -45,6 +45,7 @@ debug=0
chroot=0 chroot=0
root="" root=""
id='' id=''
desktopfiles=''
stagelevel=9 stagelevel=9
this_is_the_2nd_run=0 this_is_the_2nd_run=0
@ -178,6 +179,9 @@ builddir="$base/src.$xpkg.$id"
# get real pkg name for mapped packages # get real pkg name for mapped packages
. build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkgmapper . build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkgmapper
# set desktop file name
desktopfiles="$( echo ${base}/package/*/${pkg} )/*.desktop"
export ROCK_PKG=$pkg export ROCK_PKG=$pkg
export ROCK_XPKG=$xpkg export ROCK_XPKG=$xpkg

+ 2
- 2
scripts/functions

@ -758,8 +758,8 @@ build_this_package() {
fi fi
[ -z "$createdocs" ] && createdocs="$ROCKCFG_CREATE_DOCS" [ -z "$createdocs" ] && createdocs="$ROCKCFG_CREATE_DOCS"
fi fi
for file in $confdir/*.desktop ; do
[ -n "${desktopfiles}" ] && for file in ${desktopfiles} ; do
[ -f $file ] || continue [ -f $file ] || continue
echo -n "Install desktop file '$file': " echo -n "Install desktop file '$file': "

Loading…
Cancel
Save