package/xorg/cf/hotfix-link-conf-once.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../cf/link-conf-once.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 Only link the directory if it's not yet done (otherwise it'll cause shared files).
  18         --jsaw
  19
  20 --- cf/Imake.rules.~1.10.~      2005-08-19 00:38:58.000000000 +0200
  21 +++ cf/Imake.rules      2005-11-21 02:18:48.241697733 +0100
  22 @@ -1740,8 +1740,10 @@
  23                 (cd Concat($(DESTDIR),npath/mdir); \                    @@\
  24                  tar xf -; exit 0); exit 0); \                          @@\
  25           fi; \                                                         @@\
  26 -         $(RM) -r rdir; \                                              @@\
  27 -         $(LN) Concat($${RELPATH},npath/mdir) ldir; \                  @@\
  28 +         if [ ! -h rdir ]; then \                                      @@\
  29 +           $(RM) -r rdir; \                                            @@\
  30 +           $(LN) Concat($${RELPATH},npath/mdir) ldir; \                @@\
  31 +         fi; \                                                         @@\
  32         fi
  33  #else
  34  #define LinkConfDirectoryLong(mdir,cdir,rdir,ldir,opath,npath)
  35 @@ -1785,8 +1787,10 @@
  36           if [ -f lfile -a ! -h lfile ]; then \                         @@\
  37             cp -p lfile Concat($(DESTDIR),npath/cfile); \               @@\
  38           fi; \                                                         @@\
  39 -         $(RM) -r lfile; \                                             @@\
  40 -         $(LN) Concat($${RELPATH},npath/cfile) lfile; \                @@\
  41 +         if [ ! -h rdir ]; then \                                      @@\
  42 +           $(RM) -r lfile; \                                           @@\
  43 +           $(LN) Concat($${RELPATH},npath/cfile) lfile; \              @@\
  44 +         fi; \                                                         @@\
  45         fi
  46  #else
  47  #define LinkConfFileLong(cfile,lfile,opath,npath)