Index: trunk/libffado/src/SConscript
===================================================================
--- trunk/libffado/src/SConscript (revision 599)
+++ trunk/libffado/src/SConscript (revision 609)
@@ -144,10 +144,13 @@
 
 source = ffado_source
+pkgdata = []
 if env['ENABLE_BEBOB']:
 	libenv.AppendUnique( CCFLAGS=["-DENABLE_BEBOB"] )
 	source += bebob_source
+	pkgdata += bebob_pkgdata
 if env['ENABLE_FIREWORKS']:
 	libenv.AppendUnique( CCFLAGS=["-DENABLE_FIREWORKS"] )
 	source += fireworks_source
+	pkgdata += fireworks_pkgdata
 if env['ENABLE_MOTU']:
 	libenv.AppendUnique( CCFLAGS=["-DENABLE_MOTU"] )
@@ -171,4 +174,5 @@
 	source += amdtp_source
 	source += genericavc_source
+	pkgdata += genericavc_pkgdata
 
 if not env.GetOption( "clean" ):
@@ -210,18 +214,12 @@
 		) )
 else:
-	print "Doing simple install"
-	libenv.Alias( "install", libenv.Install( "$libdir", ffadolib ) )
-
-#
-# Install the *_pkgdata to $sharedir
-#
-for data in bebob_pkgdata:
-	libenv.Alias( "install", libenv.Install( "$sharedir", data ) )
-
-for data in genericavc_pkgdata:
-	libenv.Alias( "install", libenv.Install( "$sharedir", data ) )
-
-for data in fireworks_pkgdata:
-	libenv.Alias( "install", libenv.Install( "$sharedir", data ) )
+	#print "Doing simple install"
+	libenv.Install( "$libdir", ffadolib )
+
+#
+# Install the pkgdata to $sharedir
+#
+for data in pkgdata:
+	libenv.Install( "$sharedir", data )
 
 #
@@ -244,5 +242,4 @@
 	env2.Program( target=app, source = env.Split( apps[app] ) )
 
-env2.Alias( "install", env2.Install( "$bindir", "bebob-sync" ) )
-env2.Alias( "install", env2.Install( "$bindir", "bridgeco-downloader" ) )
-
+env2.Install( "$bindir", ["bebob-sync","bridgeco-downloader"] )
+