diff options
| author | Sebastian Schmelzer | 2009-02-18 17:32:18 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2009-02-18 17:32:18 +0100 |
| commit | 690020bf47bf5a58d4845f9a37695d88526b3a7f (patch) | |
| tree | 11eeca5d45e015c7d2d5b4ee8f4b2ce746b44e91 /Makefile | |
| parent | Moving virtual dos floppy stuff into vmchooser plugin. (diff) | |
| download | core-690020bf47bf5a58d4845f9a37695d88526b3a7f.tar.gz core-690020bf47bf5a58d4845f9a37695d88526b3a7f.tar.xz core-690020bf47bf5a58d4845f9a37695d88526b3a7f.zip | |
* added modifications from 5.0 tree
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2597 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -51,18 +51,14 @@ tarball: echo "OPENSLX_VERSION_SVNREV=\"$${OPENSLX_VERSION_SVNREV}\"" \ >>REVISION; \ echo "Creating OpenSLX $${OPENSLX_VERSION_STRING} tar ball "; \ - if test -e "../openslx-$${OPENSLX_VERSION_STRING}" -a \ - ! -L "../openslx-$${OPENSLX_VERSION_STRING}"; then \ - echo "Error: ../openslx-$${OPENSLX_VERSION_STRING} exists and is not a sym link! "; \ - exit 1; \ - fi; \ svn_repo_name=$$( pwd); \ svn_repo_name="$${svn_repo_name##*/}"; \ - if ! test -L "../openslx-$${OPENSLX_VERSION_STRING}"; then \ + if ! test -d "../openslx-$${OPENSLX_VERSION_STRING}"; then \ cd .. >/dev/null; \ - ln -s "$${svn_repo_name}" "openslx-$${OPENSLX_VERSION_STRING}"; \ + mkdir "openslx-$${OPENSLX_VERSION_STRING}"; \ + mount --bind "$${svn_repo_name}" "openslx-$${OPENSLX_VERSION_STRING}"; \ cd - >/dev/null; \ - OPENSLX_SOURCEDIR_SYMLINK_CREATED="yes"; \ + OPENSLX_SOURCEDIR_BINDMOUNT_CREATED="yes"; \ fi; \ echo -e "$(SLX_CONFIG_PATH)\n\ $(SLX_BASE_PATH)\n\ @@ -75,8 +71,9 @@ $(USR_BIN_PATH)/*" \ "$${svn_repo_name}/openslx-$${OPENSLX_VERSION_STRING}.tar.bz2" \ --exclude-from="$${svn_repo_name}/Make.exclude_from_tar" \ "openslx-$${OPENSLX_VERSION_STRING}/"; \ - test "$${OPENSLX_SOURCEDIR_SYMLINK_CREATED}" = "yes" && \ - rm -f "openslx-$${OPENSLX_VERSION_STRING}"; \ + test "$${OPENSLX_SOURCEDIR_BINDMOUNT_CREATED}" = "yes" && \ + umount "openslx-$${OPENSLX_VERSION_STRING}" && \ + rm -rf "openslx-$${OPENSLX_VERSION_STRING}"; \ cd - >/dev/null; \ rm REVISION packaging/rpm/openslx-filelist |