Use pkg-config to detect the edje data dir.

[redact.git] / lib / redact / app.rb

diff --git a/lib/redact/app.rb b/lib/redact/app.rb
index 9e892db7bb3f0ff4302c82dec63d62d316afb72f..30e6791b9e8c1073eb550ffa195e1bf711bd11c6 100644 (file)
--- a/lib/redact/app.rb
+++ b/lib/redact/app.rb
@@ -1,6 +1,4 @@
 #--
-# $Id: app.rb 48 2005-06-08 21:38:34Z 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 " +