Fixed installation problems and protection problems

svn: r162
This commit is contained in:
Don Allingham 2001-06-17 19:13:49 +00:00
parent f0924d1a60
commit 40d17d5b04
3 changed files with 25 additions and 11 deletions

View File

@ -3,6 +3,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
datadir = @datadir@/@PACKAGE@ datadir = @datadir@/@PACKAGE@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
sharedir = ${prefix}/share/gramps
@SET_MAKE@ @SET_MAKE@
@ -18,12 +19,12 @@ install:
(cd src/filters; ${MAKE} install) (cd src/filters; ${MAKE} install)
(cd src/data; ${MAKE} install) (cd src/data; ${MAKE} install)
-${INSTALL} -d ${bindir} -${INSTALL} -d ${bindir}
-${INSTALL} -d ${prefix}/share/example/gramps -${INSTALL} -d ${sharedir}/example/gramps
-${INSTALL} -d ${prefix}/share/example/gedcom -${INSTALL} -d ${sharedir}/example/gedcom
${INSTALL} gramps.sh ${bindir}/gramps ${INSTALL} gramps.sh ${bindir}/gramps
-${INSTALL} example/gramps/*.jpg ${prefix}/share/example/gramps -${INSTALL} example/gramps/*.jpg ${sharedir}/example/gramps
-${INSTALL} example/gramps/data.gramps ${prefix}/share/example/gramps -${INSTALL} example/gramps/data.gramps ${sharedir}/example/gramps
-${INSTALL} example/gedcom/*.ged ${prefix}/share/example/gedcom -${INSTALL} example/gedcom/*.ged ${sharedir}/example/gedcom
chmod +x ${bindir}/gramps chmod +x ${bindir}/gramps
uninstall: uninstall:

View File

@ -54,8 +54,8 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/pixmaps/gramps.png %{prefix}/share/pixmaps/gramps.png
# %{prefix}/share/gramps/* # %{prefix}/share/gramps/*
%{prefix}/share/locale/*/LC_MESSAGES/gramps.mo %{prefix}/share/locale/*/LC_MESSAGES/gramps.mo
%{prefix}/share/example/gedcom/* %{prefix}/share/gramps/example/gedcom/*
%{prefix}/share/example/gramps/* %{prefix}/share/gramps/example/gramps/*
%{prefix}/share/gramps/*.pyo %{prefix}/share/gramps/*.pyo
%{prefix}/share/gramps/*.so %{prefix}/share/gramps/*.so
%{prefix}/share/gramps/*.py %{prefix}/share/gramps/*.py

View File

@ -57,8 +57,14 @@ def import_photo(filename,path,prefix):
break break
thumb = path+os.sep+".thumb" thumb = path+os.sep+".thumb"
try:
if not os.path.exists(thumb): if not os.path.exists(thumb):
os.mkdir(thumb) os.mkdir(thumb)
except IOError,msg:
GnomeErrorDialog(_("Could not create %s") % thumb + "\n" + str(msg))
except:
GnomeErrorDialog(_("Could not create %s") % thumb)
try: try:
path = thumb + os.sep + base path = thumb + os.sep + base
@ -107,8 +113,15 @@ def scale_image(path,size):
def mk_thumb(source,dest,size): def mk_thumb(source,dest,size):
dir = os.path.dirname(dest) dir = os.path.dirname(dest)
try:
if not os.path.exists(dir): if not os.path.exists(dir):
os.mkdir(dir) os.mkdir(dir)
except IOError,msg:
GnomeErrorDialog(_("Could not create %s") % dir + "\n" + str(msg))
return
except:
GnomeErrorDialog(_("Could not create %s") % dir)
return
if no_pil: if no_pil:
cmd = "%s -geometry %dx%d '%s' '%s'" % (const.convert,size,size,source,dest) cmd = "%s -geometry %dx%d '%s' '%s'" % (const.convert,size,size,source,dest)