[bt-devel] Make system partly broken (was: Re: Bibletime 1.6.3 for FreeBSD)

[Martin Gruner]

Hi Thomas.

You are correct, and I am sorry for not having tested this beforehand.

Joachim, this comes from your change, can you please explain what it should do 
and why it does not work the way it should? You removed the slashes after 
$(var) for some reason.
We need to fix this very quickly so that I can release 1.6.3a. Please make the 
neccessary changes in CVS if you can right away!

Index: gen_am.sh
===================================================================
RCS file: /cvsroot/bibletime/bibletime/maintenance/gen_am.sh,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gen_am.sh   7 Dec 2006 12:42:24 -0000       1.27
+++ gen_am.sh   26 Dec 2006 11:06:02 -0000      1.28
@@ -110,7 +110,7 @@
                        echo
                        echo
 
-                       TARGET_ROOT='$(DESTDIR)$(kde_htmldir)/en/bibletime'
+                       TARGET_ROOT='$(DESTDIR)$(kde_htmldir)en/bibletime'
                        TARGET_DIR=$TARGET_ROOT/$PART
 
                        if test $HAS_FILES = YES; then
@@ -122,7 +122,7 @@
                                echo '    $(INSTALL_DATA) 
$(srcdir)/$$file '$TARGET_DIR'; \'
                                echo '    chmod a+r '$TARGET_DIR'/$$file; \'
                                echo '  done;'
-                               echo '  ln -sf ../../common '$TARGET_DIR'/common;
\'
+                               echo '  ln -sf 
$(DESTDIR)$(kde_htmldir)en/common '$TARGET_DIR'/common;\'
                                echo '  chmod -R a+r+X '$TARGET_ROOT
                                echo
                                echo 'uninstall-local:'
@@ -367,7 +367,7 @@
                                                done
                                                echo
 
-                                               TARGET_ROOT='$(DESTDIR)$(kde_htmldir)/'$I1'/bibletime'
+                                               TARGET_ROOT='$(DESTDIR)$(kde_htmldir)'$I1'/bibletime'
                                                TARGET_DIR=$TARGET_ROOT/$PART
 
                                                EN_FILES=""
@@ -381,21 +381,21 @@
                                                if test $HAS_FILES = YES; then
                                                        echo
                                                        echo 'install-data-local:'
-                                                       echo '  mkdir -p '$TARGET_DIR'/;'  #mkdir -p 
creates all directories leaing to $TARGET_DIR
+                                                       echo '  mkdir -p '$TARGET_DIR'/;'  #mkdir -p 
creates all directories leading to $TARGET_DIR
                                                        echo '  chmod -R 
a+r+X  '$TARGET_ROOT';'
                                                        echo '  for file 
in '$EN_FILES'; do \'
                                                        echo '    if test -e 
$$file; then \' ## in this directory
                                                        echo '      $(INSTALL_DATA) 
$(srcdir)/$$file '$TARGET_DIR'; \'
                                                        echo '      chmod 
a+r '$TARGET_DIR'/$$file; \'
                                                        echo '    else \'
-                                                       echo '      ln -sf ../../../en/bibletime/'$PART'/$$file '$TARGET_DIR/'$$file; 
\'
+                                                       echo '      ln -sf '$TARGET_DIR'/../../../en/bibletime/'$PART'/$$file '$TARGET_DIR/'$$file; 
\'
                                                        echo '    fi; \'
                                                        echo '  done;'
                                                        echo '  if 
test -d '$TARGET_DIR'/../../common; then \'
-                                                       echo '    ln -sf ../../common '$TARGET_DIR'/common;
\'
+                                                       echo '    ln -sf '$TARGET_DIR'../../common '$TARGET_DIR'/common;
\'
                                                        echo '  else \'
                                                        ############## Use the 
english css data ###################
-                                                       echo '    ln -sf ../../../en/common '$TARGET_DIR'/common;
\'
+                                                       echo '    ln -sf '$TARGET_DIR'/../../../en/common '$TARGET_DIR'/common;
\'
                                                        echo '  fi;'
                                                        echo '  chmod -R 
a+r+X '$TARGET_ROOT
                                                        echo



Am Mittwoch, 31. Januar 2007 schrieb Thomas Abthorpe:
> Hello again!
>
> I discovered the issue
>
> docs/handbook/unicode/Makefile  reads
>
> install-data-local:
>         mkdir -p $(DESTDIR)$(kde_htmldir)en/bibletime/handbook/;
>         chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)en/bibletime;
>
> it should read
>
>         mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/;
>         chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
>
> Thank you again for your time and attention to this matter.
>
> Yours in Christ
>
>
> Thomas
>
>
> _______________________________________________
> bt-devel mailing list
> bt-devel at crosswire.org
> http://www.crosswire.org/mailman/listinfo/bt-devel