2002-01-02 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

* libgphoto2/Makefile.am * camlibs/ * /Makefile.am: Install drivers into versioned subdirectories. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3648 67ed7778-7388-44ab-90cf-0a291f65f57c
author: Lutz Mueller <lutz@users.sourceforge.net> 2002-01-02 12:34:05 +0000
committer: Lutz Mueller <lutz@users.sourceforge.net> 2002-01-02 12:34:05 +0000
commit: 908429e2df3756b1a3d716d9fa602361ad99d390 (patch)
tree: 1958f290a36019d534f332c62a396052ad4eccad
parent: 31e67d34c14a2c1de95da9220785f528d1b5a29a (diff)
download: libgphoto2-908429e2df3756b1a3d716d9fa602361ad99d390.tar.gz
30 files changed, 37 insertions, 37 deletions
diff --git a/ChangeLog b/ChangeLog
index c630e48e4..6fc46af1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-01-02  Lutz M�ller <urc8@rz.uni-karlsruhe.de>
 
+	* libgphoto2/Makefile.am
+	* camlibs/ * /Makefile.am: Install drivers into versioned
+	  subdirectories.
+
+2002-01-02  Lutz M�ller <urc8@rz.uni-karlsruhe.de>
+
 	* frontends/command-line/main.c: Implement proper cancelling of file
 	  down- and upload.
 
diff --git a/camlibs/agfa/Makefile.am b/camlibs/agfa/Makefile.am
index 0137c763b..237a6fc2f 100644
--- a/camlibs/agfa/Makefile.am
+++ b/camlibs/agfa/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = agfa.df
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_agfa.la
 
 INCLUDES =						\
diff --git a/camlibs/barbie/Makefile.am b/camlibs/barbie/Makefile.am
index 34e63eb6a..47c14c1a7 100644
--- a/camlibs/barbie/Makefile.am
+++ b/camlibs/barbie/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = barbie.df makefile.os2 main.c compile
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_barbie.la
 
 INCLUDES =                                              \
diff --git a/camlibs/canon/Makefile.am b/camlibs/canon/Makefile.am
index b1293c6d7..538a41bed 100644
--- a/camlibs/canon/Makefile.am
+++ b/camlibs/canon/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = doc
 
 EXTRA_DIST = .indent.pro Changelog canon.df makefile.os2 mkpatch Protocol
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_canon.la
 
 CFLAGS = @CFLAGS@ -g -Wall
diff --git a/camlibs/casio/Makefile.am b/camlibs/casio/Makefile.am
index 7e38833e6..6469451aa 100644
--- a/camlibs/casio/Makefile.am
+++ b/camlibs/casio/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_casio_qv.la
 
 INCLUDES =                                              \
diff --git a/camlibs/digita/Makefile.am b/camlibs/digita/Makefile.am
index 0be4c9e2b..bd53726cc 100644
--- a/camlibs/digita/Makefile.am
+++ b/camlibs/digita/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = digita.df makefile.os2
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_digita.la
 
 INCLUDES =                                              \
diff --git a/camlibs/dimera/Makefile.am b/camlibs/dimera/Makefile.am
index 0826b0361..c4a748ac7 100644
--- a/camlibs/dimera/Makefile.am
+++ b/camlibs/dimera/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = dimera.df makefile.os2 CREDITS Protocol.txt
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_dimera3500.la
 
 CFLAGS = @CFLAGS@ -g -Wall
diff --git a/camlibs/directory/Makefile.am b/camlibs/directory/Makefile.am
index bbbcc9583..6ef759956 100644
--- a/camlibs/directory/Makefile.am
+++ b/camlibs/directory/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = directory.df directory.def makefile.os2 makedll.cmd
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_directory.la
 
 INCLUDES =                                              \
diff --git a/camlibs/fuji/Makefile.am b/camlibs/fuji/Makefile.am
index 352fbda5e..2a95b4389 100644
--- a/camlibs/fuji/Makefile.am
+++ b/camlibs/fuji/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_fuji.la
 
 INCLUDES =                                              \
diff --git a/camlibs/jamcam/Makefile.am b/camlibs/jamcam/Makefile.am
index 5868edb71..79a7d8878 100644
--- a/camlibs/jamcam/Makefile.am
+++ b/camlibs/jamcam/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_jamcam.la
 
 CFLAGS = @CFLAGS@ `glib-config --cflags`
diff --git a/camlibs/jd11/Makefile.am b/camlibs/jd11/Makefile.am
index 14275bb70..b5206933c 100644
--- a/camlibs/jd11/Makefile.am
+++ b/camlibs/jd11/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = jd11.html
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_jd11.la
 
 INCLUDES =                                              \
diff --git a/camlibs/kodak/dc120/Makefile.am b/camlibs/kodak/dc120/Makefile.am
index a2c955ee5..463e87fb7 100644
--- a/camlibs/kodak/dc120/Makefile.am
+++ b/camlibs/kodak/dc120/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = kodak.df makefile.os2
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_kodak_dc120.la
 
 INCLUDES =                                              \
diff --git a/camlibs/kodak/dc210/Makefile.am b/camlibs/kodak/dc210/Makefile.am
index 2351c7cd5..4882cdad1 100644
--- a/camlibs/kodak/dc210/Makefile.am
+++ b/camlibs/kodak/dc210/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_kodak_dc210.la
 
 INCLUDES =                                              \
diff --git a/camlibs/kodak/dc240/Makefile.am b/camlibs/kodak/dc240/Makefile.am
index ff9c5f041..bf569dede 100644
--- a/camlibs/kodak/dc240/Makefile.am
+++ b/camlibs/kodak/dc240/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = kodak.df makefile.os2
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_kodak_dc240.la
 
 INCLUDES =                                              \
diff --git a/camlibs/kodak/dc3200/Makefile.am b/camlibs/kodak/dc3200/Makefile.am
index 6a56db70b..793de4d24 100644
--- a/camlibs/kodak/dc3200/Makefile.am
+++ b/camlibs/kodak/dc3200/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = kodak.df makefile.os2
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_kodak_dc3200.la
 
 INCLUDES =                                              \
diff --git a/camlibs/konica/Makefile.am b/camlibs/konica/Makefile.am
index 9d534be5d..491745d57 100644
--- a/camlibs/konica/Makefile.am
+++ b/camlibs/konica/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = localization
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_konica.la
 
 EXTRA_DIST = EXPERTS konica.df makefile.os2
diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c
index 2202f5713..6daafa643 100644
--- a/camlibs/konica/library.c
+++ b/camlibs/konica/library.c
@@ -146,15 +146,9 @@ get_info (Camera *camera, unsigned int n, CameraFileInfo *info,
 	if (file) {
 		gp_file_set_type (file, GP_FILE_TYPE_EXIF);
 		gp_file_set_name (file, info->file.name);
-
-		/* Make a JPEG file out of it (for parser) */
-		gp_file_append (file, "\xff\xd8", 2);
-		gp_file_append (file, buffer, buffer_size);
-		gp_file_append (file, "\x01", 1);
-		gp_file_append (file, "\xff\xda", 2);
-		gp_file_append (file, "\x00\x02", 2);
-	}
-	free (buffer);
+		gp_file_set_data_and_size (file, buffer, buffer_size);
+	} else
+		free (buffer);
 
 	return (GP_OK);
 }
diff --git a/camlibs/minolta/dimagev/Makefile.am b/camlibs/minolta/dimagev/Makefile.am
index 8f572496b..ba9cc03cf 100644
--- a/camlibs/minolta/dimagev/Makefile.am
+++ b/camlibs/minolta/dimagev/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = dimagev.df makefile.os2
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_dimagev.la
 
 INCLUDES =                                              \
diff --git a/camlibs/panasonic/Makefile.am b/camlibs/panasonic/Makefile.am
index 256dc3fab..f61eb69e7 100644
--- a/camlibs/panasonic/Makefile.am
+++ b/camlibs/panasonic/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = panasonic.df makefile.os2 dc1000.df dc1580.df
 
 SUBDIRS = coolshot l859
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES =\
  libgphoto2_panasonic_dc1000.la\
  libgphoto2_panasonic_dc1580.la
diff --git a/camlibs/panasonic/coolshot/Makefile.am b/camlibs/panasonic/coolshot/Makefile.am
index 5e2c8f5ca..3c81eadac 100644
--- a/camlibs/panasonic/coolshot/Makefile.am
+++ b/camlibs/panasonic/coolshot/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_panasonic_coolshot.la
 
 INCLUDES =                                              \
diff --git a/camlibs/panasonic/l859/Makefile.am b/camlibs/panasonic/l859/Makefile.am
index f79d5ea5d..ae75b92f8 100644
--- a/camlibs/panasonic/l859/Makefile.am
+++ b/camlibs/panasonic/l859/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_panasonic_l859.la
 
 INCLUDES =                                              \
diff --git a/camlibs/polaroid/Makefile.am b/camlibs/polaroid/Makefile.am
index 18da0199e..2a67ac4f4 100644
--- a/camlibs/polaroid/Makefile.am
+++ b/camlibs/polaroid/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = jpeg.txt jpeghead.h
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES =			\
 	libgphoto2_polaroid_pdc320.la	\
 	libgphoto2_polaroid_pdc640.la	\
diff --git a/camlibs/ptp/Makefile.am b/camlibs/ptp/Makefile.am
index 0baffaa2c..55ce69afe 100644
--- a/camlibs/ptp/Makefile.am
+++ b/camlibs/ptp/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = README main.c
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_ptp.la
 
 INCLUDES =                                              \
diff --git a/camlibs/samsung/Makefile.am b/camlibs/samsung/Makefile.am
index 955d217b0..4fac887da 100644
--- a/camlibs/samsung/Makefile.am
+++ b/camlibs/samsung/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_samsung.la
 
 INCLUDES =                                              \
diff --git a/camlibs/sierra/Makefile.am b/camlibs/sierra/Makefile.am
index 71e31adb9..2e5da3c5b 100644
--- a/camlibs/sierra/Makefile.am
+++ b/camlibs/sierra/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = sierra.df makefile.os2 PROTOCOL
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_sierra.la
 
 INCLUDES =                                              \
diff --git a/camlibs/sonydscf1/Makefile.am b/camlibs/sonydscf1/Makefile.am
index 5e8e8faeb..6484ea6a5 100644
--- a/camlibs/sonydscf1/Makefile.am
+++ b/camlibs/sonydscf1/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = sonydscf1.df makefile.os2 readme todo
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_sony_dscf1.la
 
 INCLUDES =                                              \
diff --git a/camlibs/sonydscf55/Makefile.am b/camlibs/sonydscf55/Makefile.am
index e8b59074b..9af2ad487 100644
--- a/camlibs/sonydscf55/Makefile.am
+++ b/camlibs/sonydscf55/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_sony_dscf55.la
 
 INCLUDES =                                              \
diff --git a/camlibs/stv0680/Makefile.am b/camlibs/stv0680/Makefile.am
index 06bd953b2..25c4ac758 100644
--- a/camlibs/stv0680/Makefile.am
+++ b/camlibs/stv0680/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = stv0680.df makefile.os2 CREDITS LICENCE README.pdf 680_commands_and_communication_sdk.pdf.gz
 
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_stv0680.la
 
 INCLUDES =                                              \
diff --git a/camlibs/template/Makefile.am b/camlibs/template/Makefile.am
index f05c5f1b6..4d935b727 100644
--- a/camlibs/template/Makefile.am
+++ b/camlibs/template/Makefile.am
@@ -1,4 +1,4 @@
-camlibdir = $(prefix)/lib/gphoto2
+camlibdir = $(prefix)/lib/gphoto2/$(VERSION)
 camlib_LTLIBRARIES = libgphoto2_template.la
 
 INCLUDES =                                              \
diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am
index 438c4c4c1..e818b67d2 100644
--- a/libgphoto2/Makefile.am
+++ b/libgphoto2/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)/libgphoto2_port/libgphoto2_port	\
-	-DCAMLIBS=\"$(prefix)/lib/gphoto2\"
+	-DCAMLIBS=\"$(prefix)/lib/gphoto2/$(VERSION)\"
 
 lib_LTLIBRARIES = libgphoto2.la
author	Lutz Mueller <lutz@users.sourceforge.net>	2002-01-02 12:34:05 +0000
committer	Lutz Mueller <lutz@users.sourceforge.net>	2002-01-02 12:34:05 +0000
commit	908429e2df3756b1a3d716d9fa602361ad99d390 (patch)
tree	1958f290a36019d534f332c62a396052ad4eccad
parent	31e67d34c14a2c1de95da9220785f528d1b5a29a (diff)
download	libgphoto2-908429e2df3756b1a3d716d9fa602361ad99d390.tar.gz