diff -ur lingx-4.13.org/callbacks.c lingx-4.13/callbacks.c --- lingx-4.13.org/callbacks.c 2004-12-17 16:40:01.876654488 +0100 +++ lingx-4.13/callbacks.c 2004-12-17 16:46:38.481361408 +0100 @@ -66,7 +66,7 @@ default: cs=-1; } - sprintf(buffer,"/usr/cryst/LinGX/absen -f %s.hkl -s %d -i 1.0 >absen.log",gp->filenamen->fileroot,cs); + sprintf(buffer,"absen -f %s.hkl -s %d -i 1.0 >absen.log",gp->filenamen->fileroot,cs); system(buffer); fp=fopen("absen.log","r"); Nur in lingx-4.13: LinGX.log. Dateien lingx-4.13.org/locale/en/LC_MESSAGES/LinGX.mo und lingx-4.13/locale/en/LC_MESSAGES/LinGX.mo sind verschieden. diff -ur lingx-4.13.org/main.c lingx-4.13/main.c --- lingx-4.13.org/main.c 2004-12-17 16:40:01.890652360 +0100 +++ lingx-4.13/main.c 2004-12-17 16:52:29.593984176 +0100 @@ -53,7 +53,7 @@ * the project. Delete any components that you don't want shown initially. */ - gp->xml = glade_xml_new("/usr/cryst/LinGX/LinGX.glade", NULL,GETTEXT_PACKAGE); + gp->xml = glade_xml_new("/usr/share/LinGX/LinGX.glade", NULL,GETTEXT_PACKAGE); set_apps_handlers(gp->xml,gp->GP); gp->dialog1= glade_xml_get_widget(gp->xml,"dialog1"); diff -ur lingx-4.13.org/Makefile lingx-4.13/Makefile --- lingx-4.13.org/Makefile 2004-12-17 16:40:01.872655096 +0100 +++ lingx-4.13/Makefile 2004-12-17 17:19:09.110820656 +0100 @@ -1,4 +1,4 @@ -CC=gcc-3.3 +#CC=gcc-3.3 LIBS = -L/usr/X11R6/lib -lX11 `pkg-config --libs libgnomecanvas-2.0` `pkg-config --libs libgnomeprintui-2.2` `pkg-config --libs libglade-2.0` # `pkg-config --libs gtkgl-2.0` -lglut @@ -12,7 +12,7 @@ # `pkg-config --cflags gtkgl-2.0` CFLAGS += -g -Wall -Wmissing-prototypes -fno-strict-aliasing -O6 -finline-functions -fkeep-inline-functions -ffast-math -fmerge-all-constants -fomit-frame-pointer -fexpensive-optimizations -funroll-all-loops -fgcse -CFILES1 = absorb.c config.c laue.c objects.c sir.c view.c callbacks.c krist.c main.c shelxs.c wilson.c handlers.c jana.c chem.c +CFILES1 = absorb.c config.c laue.c objects.c sir.c view.c callbacks.c krist.c main.c shelxs.c wilson.c handlers.c jana.c chem.c OBJECTS1 = ${CFILES1:.c=.o} @@ -35,11 +35,11 @@ install: $(TARGETS) po/en.po - test LinGX.glade -nt $(DESTDIR)/usr/cryst/LinGX/LinGX.glade && cp LinGX.glade $(DESTDIR)/usr/cryst/LinGX ; exit 0 - test LinGX -nt $(DESTDIR)/usr/bin/LinGX && rm $(DESTDIR)/usr/bin/LinGX; cp LinGX $(DESTDIR)/usr/bin ; exit 0 - test LinGX.glade -nt $(DESTDIR)/usr/cryst/LinGX/LinGX.glade && cp LinGX.glade $(DESTDIR)/usr/cryst/LinGX ; exit 0 - test locale/en/LC_MESSAGES/LinGX.mo -nt $(DESTDIR)/usr/share/locale/en_US/LC_MESSAGES/LinGX.mo && cp locale/en/LC_MESSAGES/LinGX.mo $(DESTDIR)/usr/share/locale/en_US/LC_MESSAGES/LinGX.mo; exit 0 - cp fo_fc.tcl create_bonds.tcl interpret_fcf.tcl $(DESTDIR)/usr/bin - cp fo_fc.tcl create_bonds.tcl interpret_fcf.tcl $(DESTDIR)/usr/cryst/LinGX - cp ../tkfullprof/tkfullprof.tcl $(DESTDIR)/usr/bin - cp absen $(DESTDIR)/usr/cryst/LinGX + test LinGX.glade -nt $(DESTDIR)usr/share/LinGX/LinGX.glade && cp LinGX.glade $(DESTDIR)usr/share/LinGX ; exit 0 + test LinGX -nt $(DESTDIR)usr/bin/LinGX && rm $(DESTDIR)usr/bin/LinGX; cp LinGX $(DESTDIR)usr/bin ; exit 0 + test LinGX.glade -nt $(DESTDIR)usr/share/LinGX/LinGX.glade && cp LinGX.glade $(DESTDIR)usr/share/LinGX ; exit 0 + test locale/en/LC_MESSAGES/LinGX.mo -nt $(DESTDIR)usr/share/locale/en_US/LC_MESSAGES/LinGX.mo && cp locale/en/LC_MESSAGES/LinGX.mo $(DESTDIR)usr/share/locale/en_US/LC_MESSAGES/LinGX.mo; exit 0 + cp fo_fc.tcl create_bonds.tcl interpret_fcf.tcl $(DESTDIR)usr/bin + cp fo_fc.tcl create_bonds.tcl interpret_fcf.tcl $(DESTDIR)usr/share/LinGX + cp ../tkfullprof/tkfullprof.tcl $(DESTDIR)usr/bin + cp absen $(DESTDIR)usr/share/LinGX Nur in lingx-4.13.org/po: en.gmo. diff -ur lingx-4.13.org/view.c lingx-4.13/view.c --- lingx-4.13.org/view.c 2004-12-17 16:40:01.892652056 +0100 +++ lingx-4.13/view.c 2004-12-17 16:56:20.050949392 +0100 @@ -142,7 +142,7 @@ fclose(fp); - sprintf(aufruf,"/usr/cryst/LinGX/create_bonds.tcl %s.lst >> %s",fileroot,filename); + sprintf(aufruf,"/usr/share/LinGX/create_bonds.tcl %s.lst >> %s",fileroot,filename); if (system(aufruf)!=0) { gno_mes("Bond lengths not found -> enable BOND in ins-File and rerun shelxl"); }