X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fapp.rb;h=30e6791b9e8c1073eb550ffa195e1bf711bd11c6;hb=ce0230be820573e92bbd3b56e34d8e026e3e78ea;hp=c7266d8c09b4e33e5a810fa84e38b4e09e6325e2;hpb=3a3ed6877b4c58a5999edba67b035da2193a40bf;p=redact.git

diff --git a/lib/redact/app.rb b/lib/redact/app.rb
index c7266d8..30e6791 100644
--- a/lib/redact/app.rb
+++ b/lib/redact/app.rb
@@ -1,6 +1,4 @@
 #--
-# $Id: app.rb 43 2005-06-08 17:31:47Z tilman $
-#
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -55,7 +53,7 @@ module Redact
 				exit
 			end
 
-			OPTIONS.output ||= @options.input.sub(/.[^.]+$/, ".edj")
+			OPTIONS.output ||= OPTIONS.input.sub(/.[^.]+$/, ".edj")
 		end
 
 		def run
@@ -145,7 +143,7 @@ module Redact
 					tf_in.flush
 
 					Tempfile.open("redact_col#{col.id}.amx") do |tf_out|
-						incl = `edje-config --datadir`.strip
+						incl = `pkg-config edje --variable=datadir`.strip
 
 						c = "embryo_cc " +
 						    "-i #{incl}/include " +
@@ -200,7 +198,7 @@ EOT
 
 		def dump_fonts(ef)
 			EDJE.font_dir.each do |entry|
-				ef.write("fonts/#{entry.filename}",
+				ef.write("fonts/#{entry.alias}",
 				         File.read(entry.filename))
 			end
 		end